]> git.hungrycats.org Git - linux/commitdiff
scsi: lpfc: Fix panic if driver unloaded when port is offline
authorJames Smart <jsmart2021@gmail.com>
Tue, 26 Jun 2018 15:24:24 +0000 (08:24 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2018 06:39:42 +0000 (08:39 +0200)
[ Upstream commit d580c6137476ab307a66e278cf7dbc666230f714 ]

System crashes when the lpfc module is unloaded after making the port
offline

The nvme queue pointers were freed during port offline, but were later
accessed in pci remove path.

Validate the pointers in pci remove path before accessing them.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/lpfc/lpfc_nvme.c

index d723fd1d7b265604bf08c1cf92d3df2cd8522447..cab1fb087e6a70d54fb2ad7dd70910b8af3f6f2f 100644 (file)
@@ -2976,7 +2976,7 @@ lpfc_nvme_wait_for_io_drain(struct lpfc_hba *phba)
        struct lpfc_sli_ring  *pring;
        u32 i, wait_cnt = 0;
 
-       if (phba->sli_rev < LPFC_SLI_REV4)
+       if (phba->sli_rev < LPFC_SLI_REV4 || !phba->sli4_hba.nvme_wq)
                return;
 
        /* Cycle through all NVME rings and make sure all outstanding
@@ -2985,6 +2985,9 @@ lpfc_nvme_wait_for_io_drain(struct lpfc_hba *phba)
        for (i = 0; i < phba->cfg_nvme_io_channel; i++) {
                pring = phba->sli4_hba.nvme_wq[i]->pring;
 
+               if (!pring)
+                       continue;
+
                /* Retrieve everything on the txcmplq */
                while (!list_empty(&pring->txcmplq)) {
                        msleep(LPFC_XRI_EXCH_BUSY_WAIT_T1);