drivers: clk: sunxi: Fix memory leakage in clk-sunxi.c
PATCH 1/1 drivers: clk: sunxi: Fix memory leakage in clk-sunxi.c
From: "Victor N. Ramos Mello" <[email protected]>
Fix a possible memory leak in sun4i_osc_clk_setup(). Moved clock-frequency check to save superfluous allocation.
--- drivers/clk/sunxi/clk-sunxi.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
drivers/clk/sunxi/clk-sunxi.c +9 -7
@@ -38,18 +38,16 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)const char *clk_name = node->name;u32 rate; +if (of_property_read_u32 (node,"clock-frequency" , &rate)) +return ; +/* allocate fixed-rate and gate clock structs */ fixed =kzalloc (sizeof (struct clk_fixed_rate ),GFP_KERNEL );if (!fixed)return ; gate =kzalloc (sizeof (struct clk_gate ),GFP_KERNEL ); -if (!gate) { -kfree (fixed); -return ; - } - -if (of_property_read_u32 (node,"clock-frequency" , &rate)) -return ; +if (!gate) + goto err_gate;/* set up gate and fixed rate properties */ gate->reg =of_iomap (node,0 );
@@ -67,7 +65,11 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)if (!IS_ERR (clk)) {of_clk_add_provider (node, of_clk_src_simple_get, clk);clk_register_clkdev (clk, clk_name,NULL ); +return ; } +kfree (gate); +err_gate: +kfree (fixed); }CLK_OF_DECLARE (sun4i_osc,"allwinner,sun4i-osc-clk" , sun4i_osc_clk_setup);
Signature · 1 line
1.7.5.4
Hi Victor,
Quoted 39 lines · Victor N. Ramos Mello
From: "Victor N. Ramos Mello" <[email protected]>
Fix a possible memory leak in
sun4i_osc_clk_setup(). Moved clock-frequency check to save superfluous allocation.Signed-off-by Victor N. Ramos Mello <[email protected]>--- drivers/clk/sunxi/clk-sunxi.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)drivers/clk/sunxi/clk-sunxi.c +5
-7@@ -38,18 +38,16 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)const char *clk_name = node->name;u32 rate; +if (of_property_read_u32 (node,"clock-frequency" , &rate)) +return ; +/* allocate fixed-rate and gate clock structs */ fixed =kzalloc (sizeof (struct clk_fixed_rate ),GFP_KERNEL );if (!fixed)return ; gate =kzalloc (sizeof (struct clk_gate ),GFP_KERNEL ); -if (!gate) { -kfree (fixed); -return ; - } - -if (of_property_read_u32 (node,"clock-frequency" , &rate)) -return ; +if (!gate) + goto err_gate;/* set up gate and fixed rate properties */ gate->reg =of_iomap (node,0 );
drivers/clk/sunxi/clk-sunxi.c static void __init sun4i_osc_clk_setup(struct device_node *node) · line 72
Quoted 8 lines
drivers/clk/sunxi/clk-sunxi.c +4
-0@@ -67,7 +65,11 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)if (!IS_ERR (clk)) {of_clk_add_provider (node, of_clk_src_simple_get, clk);clk_register_clkdev (clk, clk_name,NULL ); +return ; } +kfree (gate); +err_gate: +kfree (fixed);
While the patch is appreciated, I find the logic here a bit backward compared to what's usually done.
I'd rather see here something like
if (IS_ERR(clk))
goto err_gate;
of_clk_add_provider(...);clk_register_clkdev(...);
return;
err_gate:
kfree(gate); err_fixed: kfree(fixed);
But maybe it's just me.
Thanks!
Maxime
Signature · 3 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com