lkml.org 
[lkml]   [2019]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] scsi: lpfc: Fix backport of faf5a744f4f8 ("scsi: lpfc: avoid uninitialized variable warning")
From
Date
On 6/6/2019 10:41 AM, Nathan Chancellor wrote:
> Prior to commit 4c47efc140fa ("scsi: lpfc: Move SCSI and NVME Stats to
> hardware queue structures") upstream, we allocated a cstat structure in
> lpfc_nvme_create_localport. When commit faf5a744f4f8 ("scsi: lpfc: avoid
> uninitialized variable warning") was backported, it was placed after the
> allocation so we leaked memory whenever this function was called and
> that conditional was true (so whenever CONFIG_NVME_FC is disabled).
>
> Move the IS_ENABLED if statement above the allocation since it is not
> needed when the condition is true.
>
> Reported-by: Pavel Machek <pavel@denx.de>
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
> drivers/scsi/lpfc/lpfc_nvme.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
> index 099f70798fdd..645ffb5332b4 100644
> --- a/drivers/scsi/lpfc/lpfc_nvme.c
> +++ b/drivers/scsi/lpfc/lpfc_nvme.c
> @@ -2477,14 +2477,14 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport)
> lpfc_nvme_template.max_sgl_segments = phba->cfg_nvme_seg_cnt + 1;
> lpfc_nvme_template.max_hw_queues = phba->cfg_nvme_io_channel;
>
> + if (!IS_ENABLED(CONFIG_NVME_FC))
> + return ret;
> +
> cstat = kmalloc((sizeof(struct lpfc_nvme_ctrl_stat) *
> phba->cfg_nvme_io_channel), GFP_KERNEL);
> if (!cstat)
> return -ENOMEM;
>
> - if (!IS_ENABLED(CONFIG_NVME_FC))
> - return ret;
> -
> /* localport is allocated from the stack, but the registration
> * call allocates heap memory as well as the private area.
> */

Reviewed-by: James Smart <james.smart@broadcom.com>


\
 
 \ /
  Last update: 2019-06-06 21:23    [W:0.134 / U:0.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site