The error number -ENOENT or 0 will be returned, if we can not allocate
more memory in function init_vq. If host can support multiple virtual
queues, and we fails to allocate necessary memory structures for vq,
kernel may crash due to incorrect returning.
To fix it, kernel will return correct value in init_vq.
Signed-off-by: Minfei Huang <mnghuan@xxxxxxxxx>
Signed-off-by: Minfei Huang <minfei.hmf@xxxxxxxxxxxxxxx>
---
drivers/block/virtio_blk.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 42758b5..40ecb2b 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -393,11 +393,10 @@ static int init_vq(struct virtio_blk *vblk)
if (err)
num_vqs = 1;
+ err = -ENOMEM;
vblk->vqs = kmalloc(sizeof(*vblk->vqs) * num_vqs, GFP_KERNEL);
- if (!vblk->vqs) {
- err = -ENOMEM;
+ if (!vblk->vqs)
goto out;
- }
names = kmalloc(sizeof(*names) * num_vqs, GFP_KERNEL);
if (!names)
--
2.7.4 (Apple Git-66)
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
