memory: brcmstb_dpfe: Fix memory leak

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>

diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c
index ddff687c79eaa68cfeb560497a879e5b40b83d75..dcf50bb8dd69054669a6ba09654b1d3985937cef 100644 (file)
--- a/drivers/memory/brcmstb_dpfe.c
+++ b/drivers/memory/brcmstb_dpfe.c
@@ -656,8 +656,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);
 
@@ -676,18 +678,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[],