2023-12-10 16:50:59

by Kuan-Wei Chiu

Subject: [PATCH] clk: hi3620: Fix memory leak in hi3620_mmc_clk_init()

In cases where kcalloc() fails for the 'clk_data->clks' allocation, 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_data' before returning.

Signed-off-by: Kuan-Wei Chiu <[email protected]>
---
drivers/clk/hisilicon/clk-hi3620.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
index 2d7186905abd..5d0226530fdb 100644
--- a/drivers/clk/hisilicon/clk-hi3620.c
+++ b/drivers/clk/hisilicon/clk-hi3620.c
@@ -466,8 +466,10 @@ static void __init hi3620_mmc_clk_init(struct device_node *node)
return;

clk_data->clks = kcalloc(num, sizeof(*clk_data->clks), GFP_KERNEL);
- if (!clk_data->clks)
+ if (!clk_data->clks) {
+ kfree(clk_data);
return;
+ }

for (i = 0; i < num; i++) {
struct hisi_mmc_clock *mmc_clk = &hi3620_mmc_clks[i];
--
2.25.1

2023-12-17 01:13:35

by Stephen Boyd

Subject: Re: [PATCH] clk: hi3620: Fix memory leak in hi3620_mmc_clk_init()

Quoting Kuan-Wei Chiu (2023-12-10 08:50:40)
> In cases where kcalloc() fails for the 'clk_data->clks' allocation, 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_data' before returning.
>
> Signed-off-by: Kuan-Wei Chiu <[email protected]>
> ---

Applied to clk-next