virtio_blk: Fix a slient kernel panic (347a5293) · Commits · 戴 / test

We do a lot of memory allocation in function init_vq, and don't handle the allocation failure properly. Then this function will return 0, although initialization fails due to lacking memory. At that moment, kernel will panic in guest machine, if virtio is used to drive disk. To fix this bug, we should take care of allocation failure, and return correct value to let caller know what happen. Tested-by:

Chao Fan <fanc.fnst@cn.fujitsu.com> Signed-off-by:

Minfei Huang <mnghuan@gmail.com> Signed-off-by:

Minfei Huang <minfei.hmf@alibaba-inc.com> Reviewed-by:

Cornelia Huck <cornelia.huck@de.ibm.com> Reviewed-by:

Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by:

Michael S. Tsirkin <mst@redhat.com>

drivers/block/virtio_blk.c

+8 −18

Original line number	Diff line number	Diff line
		@@ -391,22 +391,16 @@ static int init_vq(struct virtio_blk *vblk)
		num_vqs = 1;

		vblk->vqs = kmalloc(sizeof(vblk->vqs) num_vqs, GFP_KERNEL);
		if (!vblk->vqs) {
		err = -ENOMEM;
		goto out;
		}
		if (!vblk->vqs)
		return -ENOMEM;

		names = kmalloc(sizeof(names) num_vqs, GFP_KERNEL);
		if (!names)
		goto err_names;

		callbacks = kmalloc(sizeof(callbacks) num_vqs, GFP_KERNEL);
		if (!callbacks)
		goto err_callbacks;

		vqs = kmalloc(sizeof(vqs) num_vqs, GFP_KERNEL);
		if (!vqs)
		goto err_vqs;
		if (!names \|\| !callbacks \|\| !vqs) {
		err = -ENOMEM;
		goto out;
		}

		for (i = 0; i < num_vqs; i++) {
		callbacks[i] = virtblk_done;
		@@ -417,7 +411,7 @@ static int init_vq(struct virtio_blk *vblk)
		/* Discover virtqueues and write information to configuration. */
		err = vdev->config->find_vqs(vdev, num_vqs, vqs, callbacks, names);
		if (err)
		goto err_find_vqs;
		goto out;

		for (i = 0; i < num_vqs; i++) {
		spin_lock_init(&vblk->vqs[i].lock);
		@@ -425,16 +419,12 @@ static int init_vq(struct virtio_blk *vblk)
		}
		vblk->num_vqs = num_vqs;

		err_find_vqs:
		out:
		kfree(vqs);
		err_vqs:
		kfree(callbacks);
		err_callbacks:
		kfree(names);
		err_names:
		if (err)
		kfree(vblk->vqs);
		out:
		return err;
		}

Admin message