2023-09-23 20:17:44

by Jonathan Neuschäfer

Subject: [PATCH] clk: npcm7xx: Fix incorrect kfree

The corresponding allocation is:

> npcm7xx_clk_data = kzalloc(struct_size(npcm7xx_clk_data, hws,
> NPCM7XX_NUM_CLOCKS), GFP_KERNEL);

... so, kfree should be applied to npcm7xx_clk_data, not
npcm7xx_clk_data->hws.

Signed-off-by: Jonathan Neuschäfer <[email protected]>
---
drivers/clk/clk-npcm7xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/clk-npcm7xx.c b/drivers/clk/clk-npcm7xx.c
index e319cfa51a8a3..030186def9c69 100644
--- a/drivers/clk/clk-npcm7xx.c
+++ b/drivers/clk/clk-npcm7xx.c
@@ -510,7 +510,7 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)
return;

npcm7xx_init_fail:
- kfree(npcm7xx_clk_data->hws);
+ kfree(npcm7xx_clk_data);
npcm7xx_init_np_err:
iounmap(clk_base);
npcm7xx_init_error:
--
2.40.1

2023-10-19 01:07:03

by Stephen Boyd

Subject: Re: [PATCH] clk: npcm7xx: Fix incorrect kfree

Quoting Jonathan Neuschäfer (2023-09-23 06:31:27)
> The corresponding allocation is:
>
> > npcm7xx_clk_data = kzalloc(struct_size(npcm7xx_clk_data, hws,
> > NPCM7XX_NUM_CLOCKS), GFP_KERNEL);
>
> ... so, kfree should be applied to npcm7xx_clk_data, not
> npcm7xx_clk_data->hws.
>
> Signed-off-by: Jonathan Neuschäfer <[email protected]>
> ---

Applied to clk-next