[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20260105134244.hahgkijqfsb3h4al@storage>
Date: Mon, 5 Jan 2026 07:42:44 -0600
From: Nishanth Menon <nm@...com>
To: Wentao Liang <vulab@...as.ac.cn>
CC: <ssantosh@...nel.org>, <linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>, <stable@...r.kernel.org>
Subject: Re: [PATCH] soc: ti: pruss: fix double free in pruss_clk_mux_setup()
On 14:32-20251225, Wentao Liang wrote:
> 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 using a separate label to avoid the duplicate of_node_put().
>
> Fixes: ba59c9b43c86 ("soc: ti: pruss: support CORECLK_MUX and IEPCLK_MUX")
> Cc: stable@...r.kernel.org
> Signed-off-by: Wentao Liang <vulab@...as.ac.cn>
> ---
> drivers/soc/ti/pruss.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
> index d7634bf5413a..c16d96bebe3f 100644
> --- a/drivers/soc/ti/pruss.c
> +++ b/drivers/soc/ti/pruss.c
> @@ -368,13 +368,14 @@ static int pruss_clk_mux_setup(struct pruss *pruss, struct clk *clk_mux,
> clk_mux_np);
> if (ret) {
> dev_err(dev, "failed to add clkmux free action %d", ret);
> - goto put_clk_mux_np;
> + goto ret_error;
Drop this or just return ret here?
> }
>
> return 0;
if you dropped, then replace with return ret?
>
> put_clk_mux_np:
> of_node_put(clk_mux_np);
> +ret_error:
> return ret;
> }
>
> --
> 2.34.1
>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
https://ti.com/opensource
Powered by blists - more mailing lists