lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 244/563] scsi: pm80xx: Update WARN_ON check in pm8001_mpi_build_cmd()
    Date
    From: Igor Pylypiv <ipylypiv@google.com>

    [ Upstream commit 606c54ae975ad3af540b505b46b55a687501711f ]

    Starting from commit 05c6c029a44d ("scsi: pm80xx: Increase number of
    supported queues") driver initializes only max_q_num queues. Do not use an
    invalid queue if the WARN_ON condition is true.

    Link: https://lore.kernel.org/r/20211101232825.2350233-4-ipylypiv@google.com
    Fixes: 7640e1eb8c5d ("scsi: pm80xx: Make mpi_build_cmd locking consistent")
    Reviewed-by: Vishakha Channapattan <vishakhavc@google.com>
    Acked-by: Jack Wang <jinpu.wang@ionos.com>
    Signed-off-by: Igor Pylypiv <ipylypiv@google.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/pm8001/pm8001_hwi.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
    index 5d751628a6340..9b318958d78cc 100644
    --- a/drivers/scsi/pm8001/pm8001_hwi.c
    +++ b/drivers/scsi/pm8001/pm8001_hwi.c
    @@ -1323,7 +1323,9 @@ int pm8001_mpi_build_cmd(struct pm8001_hba_info *pm8001_ha,
    int q_index = circularQ - pm8001_ha->inbnd_q_tbl;
    int rv = -1;

    - WARN_ON(q_index >= PM8001_MAX_INB_NUM);
    + if (WARN_ON(q_index >= pm8001_ha->max_q_num))
    + return -EINVAL;
    +
    spin_lock_irqsave(&circularQ->iq_lock, flags);
    rv = pm8001_mpi_msg_free_get(circularQ, pm8001_ha->iomb_size,
    &pMessage);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 21:40    [W:4.159 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site