Commit f06aa52c authored by Tomas Henzl's avatar Tomas Henzl Committed by Martin K. Petersen
Browse files

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: f3fa33ac ("block: remove the ->rq_disk field in struct request")
Link: https://lore.kernel.org/r/20220324134603.28463-1-thenzl@redhat.com


Reported-by: default avatarChanghui Zhong <czhong@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8ee15ea7

drivers/scsi/scsi_logging.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}