| Date | Fri, 30 Jul 2010 10:50:19 -0700 | From | Greg KH <> | Subject | [002/205] virtio: return ENOMEM on out of memory |
| |
2.6.34-stable review patch. If anyone has any objections, please let us know.
------------------
From: Michael S. Tsirkin <mst@redhat.com>
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>
--- drivers/virtio/virtio_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -118,7 +118,7 @@ static int vring_add_indirect(struct vri 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++) {
|