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)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 11 Jul 2018 02:15:08 +0000 (22:15 -0400)
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>
drivers/scsi/lpfc/lpfc_nvme.c

index 76a5a99..ada5a2a 100644 (file)
@@ -2970,7 +2970,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
@@ -2979,6 +2979,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);