virtio: return ENOMEM on out of memory

PATCH In review Michael S. Tsirkin 3 participants 3 messages Jun 10, 2010 – Jun 15, 2010 virtio core

lore

Share & tools

lore

Michael S. Tsirkin

author maintainer

2010-06-10 15:20 UTC #0 lore raw

PATCH 1/1 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(-)

drivers/virtio/virtio_ring.c +1 -1

index ed845b7..dd35b34 100644
@@ -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++) {