scsi: lpfc: Fix ancient double free
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 25 Jan 2021 08:44:34 +0000 (11:44 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 10:38:01 +0000 (11:38 +0100)
[ Upstream commit 0be310979e5e1272d4c5b557642df4da4ce7eba4 ]

The "pmb" pointer is freed at the start of the function and then freed
again in the error handling code.

Link: https://lore.kernel.org/r/YA6E8rO51hE56SVw@mwanda
Fixes: 92d7f7b0cde3 ("[SCSI] lpfc: NPIV: add NPIV support on top of SLI-3")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/lpfc/lpfc_hbadisc.c

index 9746d2f..f4a672e 100644 (file)
@@ -1154,13 +1154,14 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        struct lpfc_vport *vport = pmb->vport;
        LPFC_MBOXQ_t *sparam_mb;
        struct lpfc_dmabuf *sparam_mp;
+       u16 status = pmb->u.mb.mbxStatus;
        int rc;
 
-       if (pmb->u.mb.mbxStatus)
-               goto out;
-
        mempool_free(pmb, phba->mbox_mem_pool);
 
+       if (status)
+               goto out;
+
        /* don't perform discovery for SLI4 loopback diagnostic test */
        if ((phba->sli_rev == LPFC_SLI_REV4) &&
            !(phba->hba_flag & HBA_FCOE_MODE) &&
@@ -1223,12 +1224,10 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
 out:
        lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
-                        "0306 CONFIG_LINK mbxStatus error x%x "
-                        "HBA state x%x\n",
-                        pmb->u.mb.mbxStatus, vport->port_state);
-sparam_out:
-       mempool_free(pmb, phba->mbox_mem_pool);
+                        "0306 CONFIG_LINK mbxStatus error x%x HBA state x%x\n",
+                        status, vport->port_state);
 
+sparam_out:
        lpfc_linkdown(phba);
 
        lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,