[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <fba5bb41-c193-d4a9-d85b-a13417150452@broadcom.com>
Date: Thu, 19 Nov 2020 12:58:59 -0800
From: James Smart <james.smart@...adcom.com>
To: Colin King <colin.king@...onical.com>,
Dick Kennedy <dick.kennedy@...adcom.com>,
"James E . J . Bottomley" <jejb@...ux.ibm.com>,
"Martin K . Petersen" <martin.petersen@...cle.com>,
linux-scsi@...r.kernel.org
Cc: kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH][next] scsi: lpfc: Fix memory leak on lcb_context
On 11/18/2020 6:13 AM, Colin King wrote:
> From: Colin Ian King <colin.king@...onical.com>
>
> 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.
>
> Addresses-Coverity: ("Resource leak")
> Fixes: 4430f7fd09ec ("scsi: lpfc: Rework locations of ndlp reference taking")
> Signed-off-by: Colin Ian King <colin.king@...onical.com>
> ---
> drivers/scsi/lpfc/lpfc_els.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
> index 03f47d1b21fe..0d3271b4c130 100644
> --- 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;
Looks good.
Reviewed-by: James Smart <james.smart@...adcom.com>
-- james
Download attachment "smime.p7s" of type "application/pkcs7-signature" (4163 bytes)
Powered by blists - more mailing lists