From: Yu Kuai yukuai3@huawei.com
commit 80b6051085c5fedcb1dfd7b2562a63a83655c4d8 upstream.
Commit fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") make a mess how blk_get_queue() is called, blk_get_queue() returns true on success while the caller expects it returns 0 on success.
Fix this problem and also add a corresponding error message on failure.
Fixes: fcaa174a9c99 ("scsi/sg: don't grab scsi host module reference") Reported-by: Marc Hartmayer mhartmay@linux.ibm.com Closes: https://lore.kernel.org/all/87lefv622n.fsf@linux.ibm.com/ Signed-off-by: Yu Kuai yukuai3@huawei.com Link: https://lore.kernel.org/r/20230705024001.177585-1-yukuai1@huaweicloud.com Tested-by: Shin'ichiro Kawasaki shinichiro.kawasaki@wdc.com Tested-by: Marc Hartmayer mhartmay@linux.ibm.com Reviewed-by: Christoph Hellwig hch@lst.de Reviewed-by: Marc Hartmayer mhartmay@linux.ibm.com Signed-off-by: Martin K. Petersen martin.petersen@oracle.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/scsi/sg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1496,9 +1496,10 @@ sg_add_device(struct device *cl_dev) int error; unsigned long iflags;
- error = blk_get_queue(scsidp->request_queue); - if (error) - return error; + if (!blk_get_queue(scsidp->request_queue)) { + pr_warn("%s: get scsi_device queue failed\n", __func__); + return -ENODEV; + }
error = -ENOMEM; cdev = cdev_alloc();