OSDN Git Service

virtio_blk: fix panic in initialization error path
authorOmar Sandoval <osandov@fb.com>
Mon, 9 Jan 2017 19:44:12 +0000 (11:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2017 16:08:58 +0000 (09:08 -0700)
commit874f22658c5479a04427103ac5d59ecfb2ba890b
tree0a2b4855ce9c9b718b6f4c61e5a48e04d7374416
parentc9e4ee445752ecd97c839ffa7e08146a614576dd
virtio_blk: fix panic in initialization error path

[ Upstream commit 6bf6b0aa3da84a3d9126919a94c49c0fb7ee2fb3 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/block/virtio_blk.c