From: Cong Ding <dinggnu@gmail.com>
To: Gregory CLEMENT <gregory.clement@free-electrons.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
linux-kernel@vger.kernel.org
Cc: Cong Ding <dinggnu@gmail.com>
Subject: [PATCH] clk: mvebu/clk-cpu.c: fix memory leakage
Date: Mon, 14 Jan 2013 17:18:07 +0000 [thread overview]
Message-ID: <1358183892-28928-1-git-send-email-dinggnu@gmail.com> (raw)
the variable cpuclk and clk_name should be properly freed.
Signed-off-by: Cong Ding <dinggnu@gmail.com>
---
drivers/clk/mvebu/clk-cpu.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index ff004578..1a0d84f 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -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;
@@ -134,11 +134,11 @@ void __init of_cpu_clk_setup(struct device_node *node)
int cpu, err;
if (WARN_ON(!clk_name))
- return;
+ goto clk_name_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);
@@ -166,7 +166,10 @@ void __init of_cpu_clk_setup(struct device_node *node)
return;
bail_out:
+ kfree(clk_name);
+clk_name_out:
kfree(clks);
+clks_out:
kfree(cpuclk);
}
--
1.7.9.5
next reply other threads:[~2013-01-14 17:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 17:18 Cong Ding [this message]
2013-01-15 14:13 ` [PATCH] clk: mvebu/clk-cpu.c: fix memory leakage Gregory CLEMENT
2013-01-15 14:41 ` Cong Ding
2013-01-15 15:23 ` [PATCH v2] " Cong Ding
2013-01-15 15:37 ` Jason Cooper
2013-01-15 16:33 ` Gregory CLEMENT
2013-01-15 18:26 ` Cong Ding
2013-01-15 18:36 ` Gregory CLEMENT
2013-01-15 18:44 ` [PATCH v3] " Cong Ding
2013-01-15 20:46 ` Gregory CLEMENT
2013-01-15 20:57 ` Jason Cooper
2013-01-16 1:01 ` Mike Turquette
2013-01-16 2:00 ` Jason Cooper
2013-01-23 1:08 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358183892-28928-1-git-send-email-dinggnu@gmail.com \
--to=dinggnu@gmail.com \
--cc=gregory.clement@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox