lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 13/99] scsi: lpfc: Fix KASAN slab-out-of-bounds in lpfc_unreg_rpi() routine
    Date
    From: James Smart <jsmart2021@gmail.com>

    [ Upstream commit affbe24429410fddf4e50ca456c090ed6d8e05bf ]

    In lpfc_offline_prep() an RPI is freed and nlp_rpi set to 0xFFFF before
    calling lpfc_unreg_rpi(). Unfortunately, lpfc_unreg_rpi() uses nlp_rpi to
    index the sli4_hba.rpi_ids[] array.

    In lpfc_offline_prep(), unreg rpi before freeing the rpi.

    Link: https://lore.kernel.org/r/20210707184351.67872-12-jsmart2021@gmail.com
    Co-developed-by: Justin Tee <justin.tee@broadcom.com>
    Signed-off-by: Justin Tee <justin.tee@broadcom.com>
    Signed-off-by: James Smart <jsmart2021@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/lpfc/lpfc_init.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
    index 9a84a0b06ee0..c4235699a123 100644
    --- a/drivers/scsi/lpfc/lpfc_init.c
    +++ b/drivers/scsi/lpfc/lpfc_init.c
    @@ -3541,6 +3541,8 @@ lpfc_offline_prep(struct lpfc_hba *phba, int mbx_action)
    spin_lock_irq(&ndlp->lock);
    ndlp->nlp_flag &= ~NLP_NPR_ADISC;
    spin_unlock_irq(&ndlp->lock);
    +
    + lpfc_unreg_rpi(vports[i], ndlp);
    /*
    * Whenever an SLI4 port goes offline, free the
    * RPI. Get a new RPI when the adapter port
    @@ -3556,7 +3558,6 @@ lpfc_offline_prep(struct lpfc_hba *phba, int mbx_action)
    lpfc_sli4_free_rpi(phba, ndlp->nlp_rpi);
    ndlp->nlp_rpi = LPFC_RPI_ALLOC_ERROR;
    }
    - lpfc_unreg_rpi(vports[i], ndlp);

    if (ndlp->nlp_type & NLP_FABRIC) {
    lpfc_disc_state_machine(vports[i], ndlp,
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-10 02:16    [W:4.030 / U:0.808 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site