[PATCH] clk: sunxi: fix memory leaks

[PATCH] clk: sunxi: fix memory leaks

[Valentin Ilie]

When the if condition is true, "fixed" and "gate" should be free'd before return.

Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
---
 drivers/clk/sunxi/clk-sunxi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 34ee69f..a970b55 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -48,8 +48,11 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)
 		return;
 	}
 
-	if (of_property_read_u32(node, "clock-frequency", &rate))
+	if (of_property_read_u32(node, "clock-frequency", &rate)) {
+		kfree(fixed);
+		kfree(gate);
 		return;
+	}
 
 	/* set up gate and fixed rate properties */
 	gate->reg = of_iomap(node, 0);
-- 
1.8.1.2

[PATCH] clk: sunxi: fix memory leaks

[Valentin Ilie]

When the if condition is true, "fixed" and "gate" should be free'd before return.

Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
---
 drivers/clk/sunxi/clk-sunxi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 34ee69f..a970b55 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -48,8 +48,11 @@ static void __init sun4i_osc_clk_setup(struct device_node *node)
 		return;
 	}
 
-	if (of_property_read_u32(node, "clock-frequency", &rate))
+	if (of_property_read_u32(node, "clock-frequency", &rate)) {
+		kfree(fixed);
+		kfree(gate);
 		return;
+	}
 
 	/* set up gate and fixed rate properties */
 	gate->reg = of_iomap(node, 0);
-- 
1.8.1.2

[PATCH] clk: sunxi: fix memory leaks

[Maxime Ripard]

Hi,

On Thu, Oct 24, 2013 at 03:25:13PM +0300, Valentin Ilie wrote:
> When the if condition is true, "fixed" and "gate" should be free'd before return.
> 
> Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>

A patch has already been submitted for this.

https://lkml.org/lkml/2013/10/18/524

Thanks anyway!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131024/f86e9e0d/attachment.sig>

Re: [PATCH] clk: sunxi: fix memory leaks

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 445 bytes --]

Hi,

On Thu, Oct 24, 2013 at 03:25:13PM +0300, Valentin Ilie wrote:
> When the if condition is true, "fixed" and "gate" should be free'd before return.
> 
> Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>

A patch has already been submitted for this.

https://lkml.org/lkml/2013/10/18/524

Thanks anyway!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]