From: Krzysztof Kozlowski <krzk@kernel.org>
To: Alex Dewar <alex.dewar90@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org,
Markus Mayer <mmayer@broadcom.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] memory: brcmstb_dpfe: Fix memory leak
Date: Thu, 20 Aug 2020 17:29:44 +0200 [thread overview]
Message-ID: <20200820152944.GB17144@kozik-lap> (raw)
In-Reply-To: <20200818110201.69933-1-alex.dewar90@gmail.com>
On Tue, Aug 18, 2020 at 12:02:01PM +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>
> ---
> drivers/memory/brcmstb_dpfe.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c
> index 60e8633b1175..f24a9dc65f3c 100644
> --- a/drivers/memory/brcmstb_dpfe.c
> +++ b/drivers/memory/brcmstb_dpfe.c
> @@ -616,7 +616,7 @@ static int brcmstb_dpfe_download_firmware(struct brcmstb_dpfe_priv *priv)
> const u32 *dmem, *imem;
> struct init_data init;
> const void *fw_blob;
> - int ret;
> + int ret = 0;
This does not look needed. Why initializing it? You cannot jump to
release_fw label or reach it without going through assignment.
Best regards,
Krzysztof
>
> /*
> * Skip downloading the firmware if the DCPU is already running and
> @@ -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
next prev parent reply other threads:[~2020-08-20 15:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 11:02 [PATCH] memory: brcmstb_dpfe: Fix memory leak Alex Dewar
2020-08-20 15:29 ` Krzysztof Kozlowski [this message]
2020-08-20 17:08 ` Alex Dewar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200820152944.GB17144@kozik-lap \
--to=krzk@kernel.org \
--cc=alex.dewar90@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmayer@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox