diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-01-02 11:39:47 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-05 09:03:03 -0700 |
| commit | 5a0ec388ef0f6e33841aeb810d7fa23f049ec4cd (patch) | |
| tree | c5cab6b9052cd1655076a568728575e9a112c0d1 /drivers/block/pktcdvd.c | |
| parent | 8b7bc849889d36572af5c6e3c3b2ad4b19a81be7 (diff) | |
| download | op-kernel-dev-5a0ec388ef0f6e33841aeb810d7fa23f049ec4cd.zip op-kernel-dev-5a0ec388ef0f6e33841aeb810d7fa23f049ec4cd.tar.gz | |
pktcdvd: Fix pkt_setup_dev() error path
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>
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 6797479..2659b25 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -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: |
