pktcdvd: Fix pkt_setup_dev() error path
Commit523e1d399c
("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: commit523e1d399c
("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>
This commit is contained in:
Родитель
8b7bc84988
Коммит
5a0ec388ef
|
@ -2745,7 +2745,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
|
||||||
pd->pkt_dev = MKDEV(pktdev_major, idx);
|
pd->pkt_dev = MKDEV(pktdev_major, idx);
|
||||||
ret = pkt_new_dev(pd, dev);
|
ret = pkt_new_dev(pd, dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_new_dev;
|
goto out_mem2;
|
||||||
|
|
||||||
/* inherit events of the host device */
|
/* inherit events of the host device */
|
||||||
disk->events = pd->bdev->bd_disk->events;
|
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);
|
mutex_unlock(&ctl_mutex);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_new_dev:
|
|
||||||
blk_cleanup_queue(disk->queue);
|
|
||||||
out_mem2:
|
out_mem2:
|
||||||
put_disk(disk);
|
put_disk(disk);
|
||||||
out_mem:
|
out_mem:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче