summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOmar Sandoval <osandov@fb.com>2017-01-09 11:44:12 -0800
committerJens Axboe <axboe@fb.com>2017-01-10 13:30:50 -0700
commit6bf6b0aa3da84a3d9126919a94c49c0fb7ee2fb3 (patch)
tree4f7b1d400af13e0b087ee14116b5a56d840d1c2a /drivers
parent25b4acfc7de0fc4da3bfea3a316f7282c6fbde81 (diff)
downloadlinux-6bf6b0aa3da84a3d9126919a94c49c0fb7ee2fb3.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/virtio_blk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 3c3b8f601469..10332c24f961 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -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;