Commit 5a0ec388 authored Jan 02, 2018 by Bart Van Assche Committed by Jens Axboe Jan 05, 2018

pktcdvd: Fix pkt_setup_dev() error path



Commit 523e1d39 ("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 523e1d39 ("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>

parent 8b7bc849

drivers/block/pktcdvd.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2745,7 +2745,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
		pd->pkt_dev = MKDEV(pktdev_major, idx);
		ret = pkt_new_dev(pd, dev);
		if (ret)
		goto out_new_dev;
		goto out_mem2;

		/* inherit events of the host device */
		disk->events = pd->bdev->bd_disk->events;
		@@ -2763,8 +2763,6 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
		mutex_unlock(&ctl_mutex);
		return 0;

		out_new_dev:
		blk_cleanup_queue(disk->queue);
		out_mem2:
		put_disk(disk);
		out_mem:

Admin message