Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200820172118.781324-1-alex.dewar90@gmail.com>
In-Reply-To: <20200820172118.781324-1-alex.dewar90@gmail.com>
From:   Markus Mayer <markus.mayer@broadcom.com>
Date:   Thu, 20 Aug 2020 10:44:15 -0700
Message-ID: <CAGt4E5uTUnC+QQBWe_VV0keNYNjBDtPpzneq+nfRJncGauzECg@mail.gmail.com>
Subject: Re: [PATCH v2] memory: brcmstb_dpfe: Fix memory leak
To:     Alex Dewar <alex.dewar90@gmail.com>
Cc:     BCM Kernel Feedback <bcm-kernel-feedback-list@broadcom.com>,
        Krzysztof Kozlowski <krzk@kernel.org>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Linux ARM Kernel <linux-arm-kernel@lists.infradead.org>,
        Linux Kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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
>