Commit 26dace36 authored Jun 06, 2019 by Nathan Chancellor Committed by Greg Kroah-Hartman Jun 09, 2019

scsi: lpfc: Fix backport of faf5a744f4f8 ("scsi: lpfc: avoid uninitialized variable warning")

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>
Reviewed-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ca309fef

drivers/scsi/lpfc/lpfc_nvme.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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.
		*/