]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
pktcdvd: Fix pkt_setup_dev() error path
authorBart Van Assche <bart.vanassche@wdc.com>
Tue, 2 Jan 2018 19:39:47 +0000 (11:39 -0800)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 3 Apr 2018 12:59:09 +0000 (14:59 +0200)
commit64dc4fdc4d903302a8d2951fda4b8697c4b5188e
treea43143b0bb3417a4e7b539dcc2c36969da2e4a05
parented1f70854e2c28ee7145c151d9e533915f0d4435
pktcdvd: Fix pkt_setup_dev() error path

BugLink: http://bugs.launchpad.net/bugs/1756121
commit 5a0ec388ef0f6e33841aeb810d7fa23f049ec4cd upstream.

Commit 523e1d399ce0 ("block: make gendisk hold a reference to its queue")
modified add_disk() and disk_release() but did not update any of the
error paths that trigger a put_disk() call after disk->queue has been
assigned. That introduced the following behavior in the pktcdvd driver
if pkt_new_dev() fails:

Kernel BUG at 00000000e98fd882 [verbose debug info unavailable]

Since disk_release() calls blk_put_queue() anyway if disk->queue != NULL,
fix this by removing the blk_cleanup_queue() call from the pkt_setup_dev()
error path.

Fixes: commit 523e1d399ce0 ("block: make gendisk hold a reference to its queue")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/block/pktcdvd.c