From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A2D0C2D0A3 for ; Tue, 3 Nov 2020 21:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCB8622384 for ; Tue, 3 Nov 2020 21:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604440044; bh=pCkPEgzzpwvdBgw1qXhxWLv8JjtaADj2Anv/szpqaqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c8mw465oMLZyNWSngv/HVmFQFXZAQwOi7lwdEeDiKkIVLxPAwUKNvWuodVZrUOZgH Gu8YcxaLlX6rtEIuDnXvOQMhtUkVcnx4BYbrsq62EdEQNxauK6S/4q/uYuwFCW7lup o5niUo+QG95Q4h9jV72ePQU1UpvWX07YA2izTa7Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731962AbgKCVrX (ORCPT ); Tue, 3 Nov 2020 16:47:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:46110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731932AbgKCUvO (ORCPT ); Tue, 3 Nov 2020 15:51:14 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7333F22404; Tue, 3 Nov 2020 20:51:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436673; bh=pCkPEgzzpwvdBgw1qXhxWLv8JjtaADj2Anv/szpqaqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YFRAEwFnQT/kVdOax1SPVNKnJNO6IBEd2Xs43QCNeT5TJKtx/Y/oD1wfbVzdl/BvZ J7BJ61NrXl369Xxs8NCUNNCceZLXdfznezQkX3iJXxexdaPAR+yxuPP8eSX1iFcJhJ Irxg1MLAmytrIIRkFYNLzxqBLIapOYyDJuOFaIac= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Dewar , Markus Mayer , Florian Fainelli , Krzysztof Kozlowski Subject: [PATCH 5.9 354/391] memory: brcmstb_dpfe: Fix memory leak Date: Tue, 3 Nov 2020 21:36:45 +0100 Message-Id: <20201103203411.023398836@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Dewar 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: Fixes: 2f330caff577 ("memory: brcmstb: Add driver for DPFE") Signed-off-by: Alex Dewar Acked-by: Markus Mayer Acked-by: Florian Fainelli Link: https://lore.kernel.org/r/20200820172118.781324-1-alex.dewar90@gmail.com Signed-off-by: Krzysztof Kozlowski Signed-off-by: Greg Kroah-Hartman --- 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[],