Commit 14c1dd95 authored by Colin Ian King's avatar Colin Ian King Committed by Martin K. Petersen
Browse files

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: 4430f7fd ("scsi: lpfc: Rework locations of ndlp reference taking")
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Addresses-Coverity: ("Resource leak")
parent 61795a53

drivers/scsi/lpfc/lpfc_els.c

+5 −3
Original line number Diff line number Diff line
@@ -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;