memory: brcmstb_dpfe: Fix memory leak (4da1edcf) · Commits · 戴 / test

In brcmstb_dpfe_download_firmware(), memory is allocated to variable fw by firmware_request_nowarn(), but never released. Fix up to release fw on all return paths. Cc: <stable@vger.kernel.org> Fixes: ("memory: brcmstb: Add driver for DPFE") Signed-off-by:

Alex Dewar <alex.dewar90@gmail.com> Acked-by:

Markus Mayer <mmayer@broadcom.com> Acked-by:

Florian Fainelli <f.fainelli@gmail.com> Link: https://lore.kernel.org/r/20200820172118.781324-1-alex.dewar90@gmail.com Signed-off-by:

Krzysztof Kozlowski <krzk@kernel.org>

drivers/memory/brcmstb_dpfe.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -647,8 +647,10 @@ static int brcmstb_dpfe_download_firmware(struct brcmstb_dpfe_priv *priv)
		return (ret == -ENOENT) ? -EPROBE_DEFER : ret;

		ret = __verify_firmware(&init, fw);
		if (ret)
		return -EFAULT;
		if (ret) {
		ret = -EFAULT;
		goto release_fw;
		}

		__disable_dcpu(priv);

		@@ -667,18 +669,20 @@ static int brcmstb_dpfe_download_firmware(struct brcmstb_dpfe_priv *priv)

		ret = __write_firmware(priv->dmem, dmem, dmem_size, is_big_endian);
		if (ret)
		return ret;
		goto release_fw;
		ret = __write_firmware(priv->imem, imem, imem_size, is_big_endian);
		if (ret)
		return ret;
		goto release_fw;

		ret = __verify_fw_checksum(&init, priv, header, init.chksum);
		if (ret)
		return ret;
		goto release_fw;

		__enable_dcpu(priv);

		return 0;
		release_fw:
		release_firmware(fw);
		return ret;
		}

		static ssize_t generic_show(unsigned int command, u32 response[],

Admin message