]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerSasha Levin <alexander.levin@microsoft.com>
Sun, 4 Mar 2018 15:28:22 +0000 (10:28 -0500)
commit996b7d3177b9860c80d903a650fa803e22f8d35e
tree8bd7100e763b93d496a8fefa9157e6271d70808f
parent627af85d2fa7f1ad35514fb4dc475264c9069553
pktcdvd: Fix pkt_setup_dev() error path

[ Upstream commit 5a0ec388ef0f6e33841aeb810d7fa23f049ec4cd ]

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>
Cc: <stable@vger.kernel.org> # v3.2
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/block/pktcdvd.c