2010-06-10 15:20:58

by Michael S. Tsirkin

Subject: [PATCH for-2.6.35] virtio: return ENOMEM on out of memory

add_buf returns ring size on out of memory,
this is not what devices expect.

Signed-off-by: Michael S. Tsirkin <[email protected]>
---

Please consider this patch for 2.6.35.

drivers/virtio/virtio_ring.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index ed845b7..dd35b34 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -119,7 +119,7 @@ static int vring_add_indirect(struct vring_virtqueue *vq,

desc = kmalloc((out + in) * sizeof(struct vring_desc), gfp);
if (!desc)
- return vq->vring.num;
+ return -ENOMEM;

/* Transfer entries from the sg list into the indirect page */
for (i = 0; i < out; i++) {
--
1.7.1.12.g42b7f

2010-06-11 12:23:32

by Amit Shah

Subject: Re: [PATCH for-2.6.35] virtio: return ENOMEM on out of memory

On (Thu) Jun 10 2010 [18:16:11], Michael S. Tsirkin wrote:
> add_buf returns ring size on out of memory,
> this is not what devices expect.
>
> Signed-off-by: Michael S. Tsirkin <[email protected]>

Acked-by: Amit Shah <[email protected]>

Amit

2010-06-15 04:34:35

by Rusty Russell

Subject: Re: [PATCH for-2.6.35] virtio: return ENOMEM on out of memory

On Fri, 11 Jun 2010 12:46:11 am Michael S. Tsirkin wrote:
> add_buf returns ring size on out of memory,
> this is not what devices expect.
>
> Signed-off-by: Michael S. Tsirkin <[email protected]>

Yep. These should all be cc'd to -stable as well?

Thanks,
Rusty.