lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 199/343] scsi: core: scsi_logging: Fix a BUG
    Date
    From: Tomas Henzl <thenzl@redhat.com>

    [ Upstream commit f06aa52cb2723ec67e92df463827b800d6c477d1 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/scsi_logging.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c
    index 1f8f80b2dbfc..a9f8de5e9639 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;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-12 10:57    [W:4.022 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site