Fix mailbox and vpi memory leaks (CR 126818)

The driver could hang or crash do to lack of memory. These memory leaks were
fixed.

commit id: 728599090a9bf3aefb1226cc063295886525cd0e

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 32b6d72cd98da8ac98355c9a7de1a526d12660de..7b6b2aa5795aba306e54830c0224a5fd3c8048be 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -481,6 +481,7 @@ lpfc_mbx_cmpl_resume_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                        ndlp, NULL);
        }
        kfree(elsiocb);
+       mempool_free(mboxq, phba->mbox_mem_pool);
 }
 
 static int

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index d1d23eed74006020a51decf48af189e8dbe67391..23055b7c29cd5533346a46d75da19a61e8f4fbf3 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -14776,7 +14776,8 @@ lpfc_sli4_resume_rpi(struct lpfc_nodelist *ndlp,
                mboxq->mbox_cmpl = cmpl;
                mboxq->context1 = arg;
                mboxq->context2 = ndlp;
-       }
+       } else
+               mboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
        mboxq->vport = ndlp->vport;
        rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_NOWAIT);
        if (rc == MBX_NOT_FINISHED) {