From: "Victor N. Ramos Mello" <victornrm@gmail.com>
To: "Mike Turquette" <mturquette@linaro.org>,
"Emilio López" <emilio@elopez.com.ar>,
"Maxime Ripard" <maxime.ripard@free-electrons.com>,
"Gregory CLEMENT" <gregory.clement@free-electrons.com>,
"Stephen Boyd" <sboyd@codeaurora.org>
Cc: linux-kernel@vger.kernel.org,
"Victor N. Ramos Mello" <victornrm@gmail.com>
Subject: [PATCH 1/1] drivers: clk: sunxi: Fix memory leakage in clk-sunxi.c
Date: Sat, 12 Oct 2013 19:05:54 -0300 [thread overview]
Message-ID: <1381615554-4167-1-git-send-email-victornrm@gmail.com> (raw)
From: "Victor N. Ramos Mello" <victornrm@gmail.com>
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 <victornrm@gmail.com>
---
drivers/clk/sunxi/clk-sunxi.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 34ee69f..a741770 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -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);
--
1.7.5.4
next reply other threads:[~2013-10-12 22:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 22:05 Victor N. Ramos Mello [this message]
2013-10-14 19:32 ` Maxime Ripard
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=1381615554-4167-1-git-send-email-victornrm@gmail.com \
--to=victornrm@gmail.com \
--cc=emilio@elopez.com.ar \
--cc=gregory.clement@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@linaro.org \
--cc=sboyd@codeaurora.org \
/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
Powered by JetHome