Skip to content

Commit

Permalink
clk: mvebu/clk-cpu.c: fix memory leakage
Browse files Browse the repository at this point in the history
the variable cpuclk and clk_name should be properly freed when error happens.

Signed-off-by: Cong Ding <dinggnu@gmail.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Cong Ding authored and Jason Cooper committed Jan 23, 2013
1 parent 11d5993 commit d6f620a
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/clk/mvebu/clk-cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void __init of_cpu_clk_setup(struct device_node *node)

clks = kzalloc(ncpus * sizeof(*clks), GFP_KERNEL);
if (WARN_ON(!clks))
return;
goto clks_out;

for_each_node_by_type(dn, "cpu") {
struct clk_init_data init;
Expand All @@ -134,11 +134,11 @@ void __init of_cpu_clk_setup(struct device_node *node)
int cpu, err;

if (WARN_ON(!clk_name))
return;
goto bail_out;

err = of_property_read_u32(dn, "reg", &cpu);
if (WARN_ON(err))
return;
goto bail_out;

sprintf(clk_name, "cpu%d", cpu);
parent_clk = of_clk_get(node, 0);
Expand Down Expand Up @@ -167,6 +167,9 @@ void __init of_cpu_clk_setup(struct device_node *node)
return;
bail_out:
kfree(clks);
while(ncpus--)
kfree(cpuclk[ncpus].clk_name);
clks_out:
kfree(cpuclk);
}

Expand Down

0 comments on commit d6f620a

Please sign in to comment.