scsi: lpfc: Fix ancient double free
Subsystems (3)
PATCH 1/1 scsi: lpfc: Fix ancient double free
The "pmb" pointer is freed at the start of the function and then freed again in the error handling code.
Fixes 92d7f7b0cde3 ("[SCSI] lpfc: NPIV: add NPIV support on top of SLI-3")
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +7 -8
@@ -1155,13 +1155,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) &&
@@ -1224,12 +1225,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,
Signature · 1 line
2.29.2
Martin K. Petersen
AppliedDan,
Quoted 2 lines
The "pmb" pointer is freed at the start of the function and then freed again in the error handling code.
Applied to 5.12/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 2 lines · Dan Carpenter
The "pmb" pointer is freed at the start of the function and then freed again in the error handling code.
Applied to 5.12/scsi-queue, thanks!
[1/1] scsi: lpfc: Fix ancient double free
https://git.kernel.org/mkp/scsi/c/0be310979e5e
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering