From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7ED87137C26; Mon, 22 Jan 2024 15:14:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705936482; cv=none; b=msCFUH/9hH6GLlZ/WF0YoYUhjhqdNthrPv8X/abhrAc6bMHP6FXmzxxE6uzib9tTeX5oERn7DhobtRhcRm44JejBZrV2QQOIAFzIiKi8XTcYFJNkMI/kjlyCBgVFaEZHdS0A75X13ckKQCB3hkLj6PU0aUssBsukNWEqNk33aqU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705936482; c=relaxed/simple; bh=CUVrPHTH8Bl42ciFheRbDL09XZRQRK4djqg71B1JyFo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Shek9EZFrCPVNyZBEGUJchPKIJ20V+0mF/2ac9cRQMf5G1vvXlZXbAkCoL21QJCK3X5sZTZ3ZsWyKC2ZuaaGKSVa4ryF81DFR+WGJm2F1SqKJ0JLsiWrI4S7l0FmURD9rPXJ8cWjkMgul9Szl9a2MRdOANHN61rlxLP0jl79/yk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KemMJ8ht; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KemMJ8ht" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B75B8C433F1; Mon, 22 Jan 2024 15:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705936482; bh=CUVrPHTH8Bl42ciFheRbDL09XZRQRK4djqg71B1JyFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KemMJ8htdOjv3edhUKsXsSRw0rooIHobzLaKGKs8fnGkRHxMUQs26koMdZB8pmjYR WdbbpxK//cFVGDiZL8COwqS3XVMlgAeOxVPGo2HCwS3IKGTxjzvU/VhrBU/zP0mpuo 73WAcgB/erAlA/WB50jCMF0MGmZB+nSxKqCIh46NyyQlwhH2SULVNWQVcfFejZOTJb EulHtQDRR7Ar9r52PHaccg4Ajp6ZIde7K3H3Q4NY7Bs2wo2iZPmEBDlpKz6vwFfzOk /DBaqivyvPvXUZN6yES7UOpHwRiyTuT7UpZ6b/DvOf+q0ZZgv9XYdEJLOKSOtLeRmq TsGiAtNWDzqkw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kuan-Wei Chiu , Peng Fan , Abel Vesa , Sasha Levin , abelvesa@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org, linux-clk@vger.kernel.org, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 31/35] clk: imx: scu: Fix memory leak in __imx_clk_gpr_scu() Date: Mon, 22 Jan 2024 10:12:28 -0500 Message-ID: <20240122151302.995456-31-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122151302.995456-1-sashal@kernel.org> References: <20240122151302.995456-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 Content-Transfer-Encoding: 8bit From: Kuan-Wei Chiu [ Upstream commit 21c0efbcb45cf94724d17b040ebc03fcd4a81f22 ] In cases where imx_clk_is_resource_owned() returns false, the code path does not handle the failure gracefully, potentially leading to a memory leak. This fix ensures proper cleanup by freeing the allocated memory for 'clk_node' before returning. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Peng Fan Link: https://lore.kernel.org/all/20231210171907.3410922-1-visitorckw@gmail.com/ Signed-off-by: Abel Vesa Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-scu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c index 1cee88b073fa..89a914a15d62 100644 --- a/drivers/clk/imx/clk-scu.c +++ b/drivers/clk/imx/clk-scu.c @@ -841,8 +841,10 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na if (!clk_node) return ERR_PTR(-ENOMEM); - if (!imx_scu_clk_is_valid(rsrc_id)) + if (!imx_scu_clk_is_valid(rsrc_id)) { + kfree(clk_node); return ERR_PTR(-EINVAL); + } clk = kzalloc(sizeof(*clk), GFP_KERNEL); if (!clk) { -- 2.43.0 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 1E5B2C47DD9 for ; Mon, 22 Jan 2024 15:15:17 +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=8Sa4N4J2mdv+q6lVd84PgNxXILaPVOlbDsA4Wmy1+LM=; b=2fXFZ5Re3Vykbf FLUeHgf41uo7pEJvWppUF8mZiCuWiOzTwBKk/rnzLNGOlBJEIdP4bUhAtJ2oIntJxMW9OF/J2BPEP 1y/K/Ps6FBZgBKSoENAjthHft8MMNUrAzez40FFeaubZ5ZkQW8Bnr3pNQQj13DXV/H/5OrTq9YWQj 7z3e3+tv3Qli7Evtw9GFe4TA1fa+z4FGyFibJLe+5dsPDxZxdDhLn1cGIxMh4oUH8boA3Dq71fcMq bFbALpm1t7ha3h1xXTGaxv/UzFG0zja9lcxPKX8rqOkRikuks7kw9sCdVbPFIFv1No5PpN2EAvVne yskLsXdVSkV+r1k5rSCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rRw0f-00CeA2-13; Mon, 22 Jan 2024 15:14:49 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rRw0c-00Ce8V-1r for linux-arm-kernel@lists.infradead.org; Mon, 22 Jan 2024 15:14:48 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 83A53CE2B24; Mon, 22 Jan 2024 15:14:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B75B8C433F1; Mon, 22 Jan 2024 15:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705936482; bh=CUVrPHTH8Bl42ciFheRbDL09XZRQRK4djqg71B1JyFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KemMJ8htdOjv3edhUKsXsSRw0rooIHobzLaKGKs8fnGkRHxMUQs26koMdZB8pmjYR WdbbpxK//cFVGDiZL8COwqS3XVMlgAeOxVPGo2HCwS3IKGTxjzvU/VhrBU/zP0mpuo 73WAcgB/erAlA/WB50jCMF0MGmZB+nSxKqCIh46NyyQlwhH2SULVNWQVcfFejZOTJb EulHtQDRR7Ar9r52PHaccg4Ajp6ZIde7K3H3Q4NY7Bs2wo2iZPmEBDlpKz6vwFfzOk /DBaqivyvPvXUZN6yES7UOpHwRiyTuT7UpZ6b/DvOf+q0ZZgv9XYdEJLOKSOtLeRmq TsGiAtNWDzqkw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kuan-Wei Chiu , Peng Fan , Abel Vesa , Sasha Levin , abelvesa@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org, linux-clk@vger.kernel.org, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 31/35] clk: imx: scu: Fix memory leak in __imx_clk_gpr_scu() Date: Mon, 22 Jan 2024 10:12:28 -0500 Message-ID: <20240122151302.995456-31-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122151302.995456-1-sashal@kernel.org> References: <20240122151302.995456-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.147 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240122_071446_780945_F6BFB021 X-CRM114-Status: GOOD ( 11.53 ) X-BeenThere: linux-arm-kernel@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: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Kuan-Wei Chiu [ Upstream commit 21c0efbcb45cf94724d17b040ebc03fcd4a81f22 ] In cases where imx_clk_is_resource_owned() returns false, the code path does not handle the failure gracefully, potentially leading to a memory leak. This fix ensures proper cleanup by freeing the allocated memory for 'clk_node' before returning. Signed-off-by: Kuan-Wei Chiu Reviewed-by: Peng Fan Link: https://lore.kernel.org/all/20231210171907.3410922-1-visitorckw@gmail.com/ Signed-off-by: Abel Vesa Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-scu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c index 1cee88b073fa..89a914a15d62 100644 --- a/drivers/clk/imx/clk-scu.c +++ b/drivers/clk/imx/clk-scu.c @@ -841,8 +841,10 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na if (!clk_node) return ERR_PTR(-ENOMEM); - if (!imx_scu_clk_is_valid(rsrc_id)) + if (!imx_scu_clk_is_valid(rsrc_id)) { + kfree(clk_node); return ERR_PTR(-EINVAL); + } clk = kzalloc(sizeof(*clk), GFP_KERNEL); if (!clk) { -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel