]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
virtio_blk: fix panic in initialization error path
authorOmar Sandoval <osandov@fb.com>
Mon, 9 Jan 2017 19:44:12 +0000 (11:44 -0800)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 22 Aug 2017 09:58:17 +0000 (06:58 -0300)
commit9bacc7898db683e287e797e9e6875c30727dbd8b
tree892e935afcd1c62773bddf07060f50cf795fc930
parent2efc5411d577a16b746ff8e84a1fa55332c64d2e
virtio_blk: fix panic in initialization error path

BugLink: http://bugs.launchpad.net/bugs/1711526
[ 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>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
drivers/block/virtio_blk.c