From patchwork Tue Aug 18 11:02:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Dewar X-Patchwork-Id: 11720513 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93C48722 for ; Tue, 18 Aug 2020 11:04:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6C34E2067C for ; Tue, 18 Aug 2020 11:04:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mRoELVgk"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lTziVxCt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C34E2067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=wXhpaPsT4JfRKoNdPidI1ptRWMFT1vJwbVvy5ByUt/o=; b=mRoELVgky5J4N3kiIj7LQnzG8F Av2RXv7RWCMSEcrkO22gMKfd5lYTWc31Go798WJWUrcJTanUnxmxwma+GPrMlLpiL3PnIMhjvjWp/ Dvz7wGxXr+qxHscEuitgUX/OqoY0pXfVx1r5KMsczqVSQEUY5M4fjfWlRn2eevATIXSCnCKeOknLF hZj1FxqBQd6d330x7n3vCcS2V5pBL1ypirUEyw44WYbbXJOdSrC6wB4WhDHdU70CqJ3+JyNsUdKtO wqyZ2dqJMzuT0RD0VjvVcd65pfDzfomkyw9DrKCIt05kGuMcxeYeIu81fIyBSOKNUYcLN/ISmfnwr x61uipBw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7zNo-0008DX-Nb; Tue, 18 Aug 2020 11:02:24 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7zNl-0008DC-DM for linux-arm-kernel@lists.infradead.org; Tue, 18 Aug 2020 11:02:22 +0000 Received: by mail-wr1-x441.google.com with SMTP id a14so17847410wra.5 for ; Tue, 18 Aug 2020 04:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5V8irRRRxRnwftdg2ujt2Pfnni+sPye5ForxfSVU5CI=; b=lTziVxCtCNaxClvjURD4ZAxeMl9SLrTRlo3tg9crwli+r+Ce+zS9oaxdHt3NdqfTdI 5Fa86ptTQwsxUkO9bE4EJHhH7nFgmxcQtRPOtU0SkOeqHJEOYhhX0YrrKOkhCGWsoRWa QKLpz1YxCI5P9F3dR1VL8yg0zvKFYE2imoLJba7ljEc/eaDsx9MtuMlQ6Vu3k7XPobXH K5MO/spovlbi4X6oyPMcjijkDLT5/Y3C/XeU8q9UBIaXMScrHr98IzaxDssaZNSgb74h pr21KG9upxRA892xblwe9bkCDcobrcUbshJgg2vA3e91W4CTOL4/2sHH7XdwqD+bwjfE LTbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5V8irRRRxRnwftdg2ujt2Pfnni+sPye5ForxfSVU5CI=; b=htw7wBpU5unf7zT9f6DP5lvCkWWaN+dR/28I9F3tDBBV48qIOQLU3UuDIfNWWof6l9 0b6N6SjT1UPUEqh0T4/9kW8y80ZJkJhi2OrelDxJFu38pCAzdl+rM9ICn0alduiFBfZ2 I/o49qhR8vYB3b02AQ17qdtM4kKId8dQI/T170P7JW1NhIPQLrLh7cCtag9Fgx8mLSmI 3uwsHk1MXNAQGoFAnzs5Uf7p+NKHrzfiF8MZjxbFJVxJdqMtKtSB3jzjcqMOa2QzivcB Z2+Wg9wXIwYtp+PgnBvCC4hTy3W0azEQlqkt46dJPYi2KXKNvxGqJmFe4EIaCvX0Qe2J vzDg== X-Gm-Message-State: AOAM531mpZfIBNklQz3ySb0a3tP7YqQHS2CiEp72Te/bx9kh3aUAgygQ nHuYZc2QBZZuj5YAp0uazIY= X-Google-Smtp-Source: ABdhPJy8DXY4Vbv4PUXnsXfID1NxwZhTns7dkyJ8QzPTWi/bfGBErLVDBAM8XlBbATD4ev3Ku+l+yQ== X-Received: by 2002:adf:97d3:: with SMTP id t19mr18635202wrb.138.1597748538730; Tue, 18 Aug 2020 04:02:18 -0700 (PDT) Received: from localhost.localdomain (cpc83661-brig20-2-0-cust443.3-3.cable.virginm.net. [82.28.105.188]) by smtp.gmail.com with ESMTPSA id k13sm32825220wmj.14.2020.08.18.04.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2020 04:02:10 -0700 (PDT) From: Alex Dewar To: Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Krzysztof Kozlowski , Florian Fainelli , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] memory: brcmstb_dpfe: Fix memory leak Date: Tue, 18 Aug 2020 12:02:01 +0100 Message-Id: <20200818110201.69933-1-alex.dewar90@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200818_070221_485087_F1E67FF5 X-CRM114-Status: GOOD ( 15.08 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [alex.dewar90[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [alex.dewar90[at]gmail.com] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Dewar Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 --- 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; /* * 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[],