diff mbox

st: fix blk_get_queue usage

Message ID 1501591374-11229-1-git-send-email-hare@suse.de (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Hannes Reinecke Aug. 1, 2017, 12:42 p.m. UTC 
From: Bodo Stroesser <bstroesser@ts.fujitsu.com>

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().

Signed-off-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
Acked-by: Shirish Pargaonkar <spargaonkar@suse.com>
Signed-off-by: Hannes Reinecke <hare@suse.com>
---
 drivers/scsi/st.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Ewan Milne Aug. 1, 2017, 4:03 p.m. UTC | #1 
On Tue, 2017-08-01 at 14:42 +0200, Hannes Reinecke wrote:
> From: Bodo Stroesser <bstroesser@ts.fujitsu.com>
> 
> 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().
> 
> Signed-off-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
> Acked-by: Shirish Pargaonkar <spargaonkar@suse.com>
> Signed-off-by: Hannes Reinecke <hare@suse.com>
> ---
>  drivers/scsi/st.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
> index 1ea34d6..f1bcaf6 100644
> --- a/drivers/scsi/st.c
> +++ b/drivers/scsi/st.c
> @@ -4300,11 +4300,11 @@ static int st_probe(struct device *dev)
>  	kref_init(&tpnt->kref);
>  	tpnt->disk = disk;
>  	disk->private_data = &tpnt->driver;
> -	disk->queue = SDp->request_queue;
>  	/* SCSI tape doesn't register this gendisk via add_disk().  Manually
>  	 * take queue reference that release_disk() expects. */
> -	if (!blk_get_queue(disk->queue))
> +	if (!blk_get_queue(SDp->request_queue))
>  		goto out_put_disk;
> +	disk->queue = SDp->request_queue;
>  	tpnt->driver = &st_template;
>  
>  	tpnt->device = SDp;

Fixes: 2b5bebccd282 ("st: Take additional queue ref in st_probe")
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Kai Mäkisara (Kolumbus) Aug. 1, 2017, 7:19 p.m. UTC | #2 
> On 1 Aug 2017, at 15.42, Hannes Reinecke <hare@suse.de> wrote:
> 
> From: Bodo Stroesser <bstroesser@ts.fujitsu.com>
> 
> 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().
> 
> Signed-off-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
> Acked-by: Shirish Pargaonkar <spargaonkar@suse.com>
> Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Kai Mäkisara <kai.makisara@kolumbus.fi>

Thanks,
Kai
Martin K. Petersen Aug. 7, 2017, 5:40 p.m. UTC | #3 
Hannes,

> 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().

Applied to 4.13/scsi-fixes. Thank you!
diff mbox

Patch

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 1ea34d6..f1bcaf6 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4300,11 +4300,11 @@  static int st_probe(struct device *dev)
 	kref_init(&tpnt->kref);
 	tpnt->disk = disk;
 	disk->private_data = &tpnt->driver;
-	disk->queue = SDp->request_queue;
 	/* SCSI tape doesn't register this gendisk via add_disk().  Manually
 	 * take queue reference that release_disk() expects. */
-	if (!blk_get_queue(disk->queue))
+	if (!blk_get_queue(SDp->request_queue))
 		goto out_put_disk;
+	disk->queue = SDp->request_queue;
 	tpnt->driver = &st_template;
 
 	tpnt->device = SDp;