clk: visconti: Fix memory leak in visconti_register_pll()

Message ID 20221122152353.204132-1-xiujianfeng@huawei.com
State New
Headers
Series clk: visconti: Fix memory leak in visconti_register_pll() |

Commit Message

Xiu Jianfeng Nov. 22, 2022, 3:23 p.m. UTC
  @pll->rate_table has allocated memory by kmemdup(), if clk_hw_register()
fails, it should be freed, otherwise it will cause memory leak issue,
this patch fixes it.

Fixes: b4cbe606dc36 ("clk: visconti: Add support common clock driver and reset driver")
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
 drivers/clk/visconti/pll.c | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Nobuhiro Iwamatsu Nov. 24, 2022, 1:22 a.m. UTC | #1
Hi Xiu,

Thanks for your patch!

> -----Original Message-----
> From: Xiu Jianfeng <xiujianfeng@huawei.com>
> Sent: Wednesday, November 23, 2022 12:24 AM
> To: mturquette@baylibre.com; sboyd@kernel.org; iwamatsu nobuhiro(岩松 信
> 洋 □SWC◯ACT) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Cc: linux-clk@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> linux-kernel@vger.kernel.org
> Subject: [PATCH] clk: visconti: Fix memory leak in visconti_register_pll()
> 
> @pll->rate_table has allocated memory by kmemdup(), if clk_hw_register()
> fails, it should be freed, otherwise it will cause memory leak issue, this patch
> fixes it.
> 
> Fixes: b4cbe606dc36 ("clk: visconti: Add support common clock driver and
> reset driver")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>

Acked-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>

Best regards,
  Nobuhiro
> ---
>  drivers/clk/visconti/pll.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/clk/visconti/pll.c b/drivers/clk/visconti/pll.c index
> a484cb945d67..1f3234f22667 100644
> --- a/drivers/clk/visconti/pll.c
> +++ b/drivers/clk/visconti/pll.c
> @@ -277,6 +277,7 @@ static struct clk_hw *visconti_register_pll(struct
> visconti_pll_provider *ctx,
>  	ret = clk_hw_register(NULL, &pll->hw);
>  	if (ret) {
>  		pr_err("failed to register pll clock %s : %d\n", name, ret);
> +		kfree(pll->rate_table);
>  		kfree(pll);
>  		pll_hw_clk = ERR_PTR(ret);
>  	}
> --
> 2.17.1
  
Stephen Boyd Nov. 29, 2022, 8:11 p.m. UTC | #2
Quoting Xiu Jianfeng (2022-11-22 07:23:53)
> @pll->rate_table has allocated memory by kmemdup(), if clk_hw_register()
> fails, it should be freed, otherwise it will cause memory leak issue,
> this patch fixes it.
> 
> Fixes: b4cbe606dc36 ("clk: visconti: Add support common clock driver and reset driver")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---

Applied to clk-next
  

Patch

diff --git a/drivers/clk/visconti/pll.c b/drivers/clk/visconti/pll.c
index a484cb945d67..1f3234f22667 100644
--- a/drivers/clk/visconti/pll.c
+++ b/drivers/clk/visconti/pll.c
@@ -277,6 +277,7 @@  static struct clk_hw *visconti_register_pll(struct visconti_pll_provider *ctx,
 	ret = clk_hw_register(NULL, &pll->hw);
 	if (ret) {
 		pr_err("failed to register pll clock %s : %d\n", name, ret);
+		kfree(pll->rate_table);
 		kfree(pll);
 		pll_hw_clk = ERR_PTR(ret);
 	}