Commit 6bf6b0aa authored Jan 09, 2017 by Omar Sandoval Committed by Jens Axboe Jan 10, 2017

virtio_blk: fix panic in initialization error path



If blk_mq_init_queue() returns an error, it gets assigned to
vblk->disk->queue. Then, when we call put_disk(), we end up calling
blk_put_queue() with the ERR_PTR, causing a bad dereference. Fix it by
only assigning to vblk->disk->queue on success.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 25b4acfc

drivers/block/virtio_blk.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -630,11 +630,12 @@ static int virtblk_probe(struct virtio_device *vdev)
		if (err)
		goto out_put_disk;

		q = vblk->disk->queue = blk_mq_init_queue(&vblk->tag_set);
		q = blk_mq_init_queue(&vblk->tag_set);
		if (IS_ERR(q)) {
		err = -ENOMEM;
		goto out_free_tags;
		}
		vblk->disk->queue = q;

		q->queuedata = vblk;