virtio: return ENOMEM on out of memory

commit 686d363786a53ed28ee875b84ef24e6d5126ef6f upstream.

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

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 0f90634bcb85d170e64ce6e2addee12f5fb37f82..6007eba04013bf592db7788b29be352590cf88f6 100644 (file)
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -118,7 +118,7 @@ static int vring_add_indirect(struct vring_virtqueue *vq,
 
        desc = kmalloc((out + in) * sizeof(struct vring_desc), GFP_ATOMIC);
        if (!desc)
-               return vq->vring.num;
+               return -ENOMEM;
 
        /* Transfer entries from the sg list into the indirect page */
        for (i = 0; i < out; i++) {