2022-11-22 14:07:57

by Xiu Jianfeng

Subject: [PATCH] clk: st: Fix memory leak in st_of_quadfs_setup()

If st_clk_register_quadfs_pll() fails, @lock should be freed before goto
@err_exit, otherwise will cause meory leak issue, fix it.

Signed-off-by: Xiu Jianfeng <[email protected]>
---
drivers/clk/st/clkgen-fsyn.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c
index d820292a381d..40df1db102a7 100644
--- a/drivers/clk/st/clkgen-fsyn.c
+++ b/drivers/clk/st/clkgen-fsyn.c
@@ -1020,9 +1020,10 @@ static void __init st_of_quadfs_setup(struct device_node *np,

clk = st_clk_register_quadfs_pll(pll_name, clk_parent_name, datac->data,
reg, lock);
- if (IS_ERR(clk))
+ if (IS_ERR(clk)) {
+ kfree(lock);
goto err_exit;
- else
+ } else
pr_debug("%s: parent %s rate %u\n",
__clk_get_name(clk),
__clk_get_name(clk_get_parent(clk)),
--
2.17.1

2022-11-22 17:23:06

by Patrice CHOTARD

Subject: Re: [PATCH] clk: st: Fix memory leak in st_of_quadfs_setup()

Hi Xiu

On 11/22/22 14:36, Xiu Jianfeng wrote:
> If st_clk_register_quadfs_pll() fails, @lock should be freed before goto
> @err_exit, otherwise will cause meory leak issue, fix it.
>
> Signed-off-by: Xiu Jianfeng <[email protected]>
> ---
> drivers/clk/st/clkgen-fsyn.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c
> index d820292a381d..40df1db102a7 100644
> --- a/drivers/clk/st/clkgen-fsyn.c
> +++ b/drivers/clk/st/clkgen-fsyn.c
> @@ -1020,9 +1020,10 @@ static void __init st_of_quadfs_setup(struct device_node *np,
>
> clk = st_clk_register_quadfs_pll(pll_name, clk_parent_name, datac->data,
> reg, lock);
> - if (IS_ERR(clk))
> + if (IS_ERR(clk)) {
> + kfree(lock);
> goto err_exit;
> - else
> + } else
> pr_debug("%s: parent %s rate %u\n",
> __clk_get_name(clk),
> __clk_get_name(clk_get_parent(clk)),

Reviewed-by: Patrice Chotard <[email protected]>

Thanks
Patrice

2022-12-08 02:41:16

by Stephen Boyd

Subject: Re: [PATCH] clk: st: Fix memory leak in st_of_quadfs_setup()

Quoting Xiu Jianfeng (2022-11-22 05:36:14)
> If st_clk_register_quadfs_pll() fails, @lock should be freed before goto
> @err_exit, otherwise will cause meory leak issue, fix it.
>
> Signed-off-by: Xiu Jianfeng <[email protected]>
> ---

Applied to clk-next