| From 4da1edcf8f226d53c02c6b0e3077d581115b30d0 Mon Sep 17 00:00:00 2001 |
| From: Alex Dewar <alex.dewar90@gmail.com> |
| Date: Thu, 20 Aug 2020 18:21:18 +0100 |
| Subject: memory: brcmstb_dpfe: Fix memory leak |
| |
| From: Alex Dewar <alex.dewar90@gmail.com> |
| |
| commit 4da1edcf8f226d53c02c6b0e3077d581115b30d0 upstream. |
| |
| 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: 2f330caff577 ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/memory/brcmstb_dpfe.c | 16 ++++++++++------ |
| 1 file changed, 10 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/memory/brcmstb_dpfe.c |
| +++ b/drivers/memory/brcmstb_dpfe.c |
| @@ -656,8 +656,10 @@ static int brcmstb_dpfe_download_firmwar |
| 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); |
| |
| @@ -676,18 +678,20 @@ static int brcmstb_dpfe_download_firmwar |
| |
| 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[], |