scsi: lpfc: Fix memory leak on lcb_context

Currently there is an error return path that neglects to free the
allocation for lcb_context.  Fix this by adding a new error free exit path
that kfree's lcb_context before returning.  Use this new kfree exit path in
another exit error path that also kfree's the same object, allowing a line
of code to be removed.

Link: https://lore.kernel.org/r/20201118141314.462471-1-colin.king@canonical.com
Fixes: 4430f7fd09ec ("scsi: lpfc: Rework locations of ndlp reference taking")
Reviewed-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Addresses-Coverity: ("Resource leak")

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 03f47d1b21fe2e98e0f9293075203fa7fbb0eb38..cfd95ca698889145979e5cfb44b79fe05b866085 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -6515,18 +6515,20 @@ lpfc_els_rcv_lcb(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        lcb_context->ndlp = lpfc_nlp_get(ndlp);
        if (!lcb_context->ndlp) {
                rjt_err = LSRJT_UNABLE_TPC;
-               goto rjt;
+               goto rjt_free;
        }
 
        if (lpfc_sli4_set_beacon(vport, lcb_context, state)) {
                lpfc_printf_vlog(ndlp->vport, KERN_ERR, LOG_TRACE_EVENT,
                                 "0193 failed to send mail box");
-               kfree(lcb_context);
                lpfc_nlp_put(ndlp);
                rjt_err = LSRJT_UNABLE_TPC;
-               goto rjt;
+               goto rjt_free;
        }
        return 0;
+
+rjt_free:
+       kfree(lcb_context);
 rjt:
        memset(&stat, 0, sizeof(stat));
        stat.un.b.lsRjtRsnCode = rjt_err;