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 3AE0B3F739D; Sat, 28 Feb 2026 17:42:45 +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=1772300565; cv=none; b=NPZTKzdfmWN9ckDpmlinzzgqIp1xpZohbtAEixwPa3wu8cFxISMl70cocrkT8Bdm/prS7/GKWauT5QCwnliyuWaQFpyvdSfBbKp/btJXVKIS3l9RMMiiU3cTWEbvnmPp7CzSXYX0cwNPwgwV9NnDqhIHMOkh9zjt3IaO8g2/aqE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300565; c=relaxed/simple; bh=9cr3n3gmMpWWaSZjZA2afqSrWBNC6bCrHzSRJ4+2g74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oglukAxGHt5B58mnElLkDk7iJKPHnraYNzG8y06hW1rz1eb5S4JUAjZOaOyT+PVCk+v3yEsdD5ld8luftixlHcsiE5paxffDa+P1Oux2Jzfk3dna85EjJwEuhJdn0DwOD997ETpLwmO4cSA0COgOUaqPxgLhSBVxXYWKymzKfl8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sj6D9wsE; 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="sj6D9wsE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E1AAC19424; Sat, 28 Feb 2026 17:42:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300565; bh=9cr3n3gmMpWWaSZjZA2afqSrWBNC6bCrHzSRJ4+2g74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sj6D9wsEL3KpaSfXAhvaWcDaJAZKj3AkKT7RvsvPj5Jzd9MlRTRkCiBMZNVsULSR/ +lSr5Oa5LY8HJ+XtH6vzGH/NjpXoaZghXmRzT8GIlMHE25/JWmW5Uqr2wO6KOE6SkP tYqHCf1tC/RIqAU7eItJUQbusw6bL9QaaocK5LuNRdqx2C5AcHNoOcbczDp3L/Df52 1HpynZv6r6pZ7ekbSzb+8FymuSfSsa2a4YjHD7B6V3Ox4S8mP/sPuyv/6eycvDJY2R 6I8wUD+vtzR/pl79t19Ysbn0Xnd2k+dZ8ZeWzb14Ym6BVXO0iX0snDIJ7pntHRrESv h3xPCFM1wsoOQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wentao Liang , Nishanth Menon , Sasha Levin Subject: [PATCH 6.19 605/844] soc: ti: pruss: Fix double free in pruss_clk_mux_setup() Date: Sat, 28 Feb 2026 12:28:38 -0500 Message-ID: <20260228173244.1509663-606-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Wentao Liang [ Upstream commit 80db65d4acfb9ff12d00172aed39ea8b98261aad ] In the pruss_clk_mux_setup(), the devm_add_action_or_reset() indirectly calls pruss_of_free_clk_provider(), which calls of_node_put(clk_mux_np) on the error path. However, after the devm_add_action_or_reset() returns, the of_node_put(clk_mux_np) is called again, causing a double free. Fix by returning directly, to avoid the duplicate of_node_put(). Fixes: ba59c9b43c86 ("soc: ti: pruss: support CORECLK_MUX and IEPCLK_MUX") Cc: stable@vger.kernel.org Signed-off-by: Wentao Liang Link: https://patch.msgid.link/20260113014716.2464741-1-vulab@iscas.ac.cn Signed-off-by: Nishanth Menon Signed-off-by: Sasha Levin --- drivers/soc/ti/pruss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 038576805bfa0..0fd59c73f585d 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -366,12 +366,10 @@ static int pruss_clk_mux_setup(struct pruss *pruss, struct clk *clk_mux, ret = devm_add_action_or_reset(dev, pruss_of_free_clk_provider, clk_mux_np); - if (ret) { + if (ret) dev_err(dev, "failed to add clkmux free action %d", ret); - goto put_clk_mux_np; - } - return 0; + return ret; put_clk_mux_np: of_node_put(clk_mux_np); -- 2.51.0