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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9EC95C4332F for ; Tue, 7 Nov 2023 12:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RfV4+HdMwlLRV5eBBRBdtW1XFuosclK8MkrOTZB8eLI=; b=lFwPyk+irvML7c STdyUk93raNONzWXaDH3+vUM9+CADIoIrQUO1ZVG42+tyjUCEcsIIkzdLUo/XjOPKUk2k3iEmEsjJ BA6nBVcbjb5nx0QJx5dTpeMkXBQVRLUwCdD8s21v6zsmQ5SvIyH/7rE4GBbzAnlsgGzRn3ujELFhL Nns+uZtqFy4zxUnJ5fqPy/OD95kD3Y+ubnkwqDZ2nRM8vWkEZv8TiCrf8EGOQ399sNFvE1Cm/y7eh jj2b85ec79UA10k57nDht+N+G8g1vcLlhVYLQI3Ire+HCO3OVIpunbSkco2j/hXC1yh0W0dpI2KgI AW0jh0RVuQS1pWEYDLog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0KuS-001QLy-1F for ath12k@archiver.kernel.org; Tue, 07 Nov 2023 12:10:20 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0KuO-001QIi-39 for ath12k@lists.infradead.org; Tue, 07 Nov 2023 12:10:18 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 58CFBCE0EC2; Tue, 7 Nov 2023 12:10:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2057C433CC; Tue, 7 Nov 2023 12:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699359014; bh=m4GR3HEp/0QZHpgM7Xx9QUuUGlCZyWMpGXU8UeBqoPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VNZ02GIptFMwq/Lkq6IDTWLIm++FOCVpWXLnPt3Ez3gDVnuLrQK6z/p1uTOd3Uy5j SjFvhTvJinaLmkWWoKpJJ6MI4mXh/9QUXzAQSo8LUollu0rYCth1HuqnNJlhKT1tYB e/luh13kmyK+LZlxK8cBlBiV5m9AcyxpQJ/ROtwVbRabilkFsQhUJRZGdjBoLblmWk iPw6Vcehr1pJax/uh9QnAk+8fjsylZgWOC01p+F76KQ082thXQbTMR9HN4e0n7HqNp oHq/uC+4ZqlBRFR73MGWDdevuJyBNqKBmPrgHP8nCNZxqCsG8LrCxnXuhJCPCX6nk6 rZOkkpbcQpIDw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ma Ke , Kalle Valo , Sasha Levin , kvalo@kernel.org, quic_jjohnson@quicinc.com, ath12k@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 17/30] wifi: ath12k: mhi: fix potential memory leak in ath12k_mhi_register() Date: Tue, 7 Nov 2023 07:08:32 -0500 Message-ID: <20231107120922.3757126-17-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107120922.3757126-1-sashal@kernel.org> References: <20231107120922.3757126-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.10 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231107_041017_190396_6366FFA5 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: ath12k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ath12k" Errors-To: ath12k-bounces+ath12k=archiver.kernel.org@lists.infradead.org From: Ma Ke [ Upstream commit 47c27aa7ded4b8ead19b3487cc42a6185b762903 ] mhi_alloc_controller() allocates a memory space for mhi_ctrl. When some errors occur, mhi_ctrl should be freed by mhi_free_controller() and set ab_pci->mhi_ctrl = NULL. We can fix it by calling mhi_free_controller() when the failure happens and set ab_pci->mhi_ctrl = NULL in all of the places where we call mhi_free_controller(). Signed-off-by: Ma Ke Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20230922021036.3604157-1-make_ruc2021@163.com Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath12k/mhi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/mhi.c b/drivers/net/wireless/ath/ath12k/mhi.c index 42f1140baa4fe..f83d3e09ae366 100644 --- a/drivers/net/wireless/ath/ath12k/mhi.c +++ b/drivers/net/wireless/ath/ath12k/mhi.c @@ -370,8 +370,7 @@ int ath12k_mhi_register(struct ath12k_pci *ab_pci) ret = ath12k_mhi_get_msi(ab_pci); if (ret) { ath12k_err(ab, "failed to get msi for mhi\n"); - mhi_free_controller(mhi_ctrl); - return ret; + goto free_controller; } mhi_ctrl->iova_start = 0; @@ -388,11 +387,15 @@ int ath12k_mhi_register(struct ath12k_pci *ab_pci) ret = mhi_register_controller(mhi_ctrl, ab->hw_params->mhi_config); if (ret) { ath12k_err(ab, "failed to register to mhi bus, err = %d\n", ret); - mhi_free_controller(mhi_ctrl); - return ret; + goto free_controller; } return 0; + +free_controller: + mhi_free_controller(mhi_ctrl); + ab_pci->mhi_ctrl = NULL; + return ret; } void ath12k_mhi_unregister(struct ath12k_pci *ab_pci) -- 2.42.0 -- ath12k mailing list ath12k@lists.infradead.org https://lists.infradead.org/mailman/listinfo/ath12k