Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: st: fix blk_get_queue usage

If blk_queue_get() in st_probe fails, disk->queue must not be set to
SDp->request_queue, as that would result in put_disk() dropping a not
taken reference.

Thus, disk->queue should be set only after a successful blk_queue_get().

Fixes: 2b5bebccd282 ("st: Take additional queue ref in st_probe")
Signed-off-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
Acked-by: Shirish Pargaonkar <spargaonkar@suse.com>
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Acked-by: Kai Mäkisara <kai.makisara@kolumbus.fi>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bodo Stroesser and committed by
Martin K. Petersen
180efde0 be37aa4b

+2 -2
+2 -2
drivers/scsi/st.c
··· 4299 4299 kref_init(&tpnt->kref); 4300 4300 tpnt->disk = disk; 4301 4301 disk->private_data = &tpnt->driver; 4302 - disk->queue = SDp->request_queue; 4303 4302 /* SCSI tape doesn't register this gendisk via add_disk(). Manually 4304 4303 * take queue reference that release_disk() expects. */ 4305 - if (!blk_get_queue(disk->queue)) 4304 + if (!blk_get_queue(SDp->request_queue)) 4306 4305 goto out_put_disk; 4306 + disk->queue = SDp->request_queue; 4307 4307 tpnt->driver = &st_template; 4308 4308 4309 4309 tpnt->device = SDp;