diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-06-10 18:16:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:29:17 -0700 |
| commit | e61dcd092ff55415060b37bb4a6cf855385768b9 (patch) | |
| tree | b67fb85cdfb4b0b51546f005030f0ec51346723b | |
| parent | d674601ce1cd0123e065884f4d84e29f10e0b108 (diff) | |
| download | lwn-e61dcd092ff55415060b37bb4a6cf855385768b9.tar.gz lwn-e61dcd092ff55415060b37bb4a6cf855385768b9.zip | |
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>
| -rw-r--r-- | 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 0f90634bcb85..6007eba04013 100644 --- 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++) { |