diff options
| author | Tomas Henzl <thenzl@redhat.com> | 2022-03-24 14:46:03 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-03-30 05:29:19 +0200 |
| commit | f06aa52cb2723ec67e92df463827b800d6c477d1 (patch) | |
| tree | cbdf31d9474a03c89350be412ecd32e2c6be12af | |
| parent | scsi: ufs: core: Remove unused field in struct ufs_hba (diff) | |
| download | linux-f06aa52cb2723ec67e92df463827b800d6c477d1.tar.xz linux-f06aa52cb2723ec67e92df463827b800d6c477d1.zip | |
scsi: core: scsi_logging: Fix a BUG
The request_queue may be NULL in a request, for example when it comes from
scsi_ioctl_reset(). Check it before use.
Fixes: f3fa33acca9f ("block: remove the ->rq_disk field in struct request")
Link: https://lore.kernel.org/r/20220324134603.28463-1-thenzl@redhat.com
Reported-by: Changhui Zhong <czhong@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/scsi_logging.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c index ff89de86545d..b02af340c2d3 100644 --- a/drivers/scsi/scsi_logging.c +++ b/drivers/scsi/scsi_logging.c @@ -30,7 +30,7 @@ static inline const char *scmd_name(const struct scsi_cmnd *scmd) { struct request *rq = scsi_cmd_to_rq((struct scsi_cmnd *)scmd); - if (!rq->q->disk) + if (!rq->q || !rq->q->disk) return NULL; return rq->q->disk->disk_name; } |