* [PATCH v2] memory: brcmstb_dpfe: Fix memory leak
@ 2020-08-20 17:21 Alex Dewar
2020-08-20 17:44 ` Markus Mayer
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alex Dewar @ 2020-08-20 17:21 UTC (permalink / raw)
To: Markus Mayer, bcm-kernel-feedback-list, Krzysztof Kozlowski,
Florian Fainelli, linux-arm-kernel, linux-kernel
Cc: Alex Dewar
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.
Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
---
v2: Don't assign ret unnecessarily (Krzysztof)
---
drivers/memory/brcmstb_dpfe.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c
index 60e8633b1175..e08528b12cbd 100644
--- a/drivers/memory/brcmstb_dpfe.c
+++ b/drivers/memory/brcmstb_dpfe.c
@@ -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[],
--
2.28.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] memory: brcmstb_dpfe: Fix memory leak
2020-08-20 17:21 [PATCH v2] memory: brcmstb_dpfe: Fix memory leak Alex Dewar
@ 2020-08-20 17:44 ` Markus Mayer
2020-08-20 17:48 ` Florian Fainelli
2020-08-20 18:52 ` Krzysztof Kozlowski
2 siblings, 0 replies; 4+ messages in thread
From: Markus Mayer @ 2020-08-20 17:44 UTC (permalink / raw)
To: Alex Dewar
Cc: Florian Fainelli, BCM Kernel Feedback, Linux ARM Kernel,
Krzysztof Kozlowski, Linux Kernel
On Thu, 20 Aug 2020 at 10:21, Alex Dewar <alex.dewar90@gmail.com> wrote:
>
> 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.
Thanks for the fix!
Acked-by: Markus Mayer <mmayer@broadcom.com>
> Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
> ---
> v2: Don't assign ret unnecessarily (Krzysztof)
> ---
> drivers/memory/brcmstb_dpfe.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c
> index 60e8633b1175..e08528b12cbd 100644
> --- a/drivers/memory/brcmstb_dpfe.c
> +++ b/drivers/memory/brcmstb_dpfe.c
> @@ -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[],
> --
> 2.28.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] memory: brcmstb_dpfe: Fix memory leak
2020-08-20 17:21 [PATCH v2] memory: brcmstb_dpfe: Fix memory leak Alex Dewar
2020-08-20 17:44 ` Markus Mayer
@ 2020-08-20 17:48 ` Florian Fainelli
2020-08-20 18:52 ` Krzysztof Kozlowski
2 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2020-08-20 17:48 UTC (permalink / raw)
To: Alex Dewar, Markus Mayer, bcm-kernel-feedback-list,
Krzysztof Kozlowski, Florian Fainelli, linux-arm-kernel,
linux-kernel
On 8/20/20 10:21 AM, Alex Dewar wrote:
> 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.
>
> Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Fixes: 2f330caff577 ("memory: brcmstb: Add driver for DPFE")
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] memory: brcmstb_dpfe: Fix memory leak
2020-08-20 17:21 [PATCH v2] memory: brcmstb_dpfe: Fix memory leak Alex Dewar
2020-08-20 17:44 ` Markus Mayer
2020-08-20 17:48 ` Florian Fainelli
@ 2020-08-20 18:52 ` Krzysztof Kozlowski
2 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2020-08-20 18:52 UTC (permalink / raw)
To: Alex Dewar
Cc: Florian Fainelli, bcm-kernel-feedback-list, linux-arm-kernel,
Markus Mayer, linux-kernel
On Thu, Aug 20, 2020 at 06:21:18PM +0100, Alex Dewar wrote:
> 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.
>
> Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
> ---
> v2: Don't assign ret unnecessarily (Krzysztof)
> ---
> drivers/memory/brcmstb_dpfe.c | 16 ++++++++++------
Thanks, applied with acks, CC stable and Fixes tag.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-20 18:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-20 17:21 [PATCH v2] memory: brcmstb_dpfe: Fix memory leak Alex Dewar
2020-08-20 17:44 ` Markus Mayer
2020-08-20 17:48 ` Florian Fainelli
2020-08-20 18:52 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).