[PATCH] clk: versatile: fix memory leak

[PATCH] clk: versatile: fix memory leak

[Sudip Mukherjee]

If of_clk_parent_fill() fails then we printed an error message and
returned. But we missed freeing sp810.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/clk/versatile/clk-sp810.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/versatile/clk-sp810.c b/drivers/clk/versatile/clk-sp810.c
index a1cdef6..6a36c8b 100644
--- a/drivers/clk/versatile/clk-sp810.c
+++ b/drivers/clk/versatile/clk-sp810.c
@@ -102,6 +102,7 @@ static void __init clk_sp810_of_setup(struct device_node *node)
 
 	if (of_clk_parent_fill(node, parent_names, num) != num) {
 		pr_warn("Failed to obtain parent clocks for SP810!\n");
+		kfree(sp810);
 		return;
 	}
 
-- 
1.9.1

Re: [PATCH] clk: versatile: fix memory leak

[Stephen Boyd]

On 11/16, Sudip Mukherjee wrote:
> If of_clk_parent_fill() fails then we printed an error message and
> returned. But we missed freeing sp810.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---

Applied to clk-next

We don't need that error message on allocation failure either.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] clk: versatile: fix memory leak

[Sudip Mukherjee]

On Wed, Nov 18, 2015 at 02:24:46PM -0800, Stephen Boyd wrote:
> On 11/16, Sudip Mukherjee wrote:
> > If of_clk_parent_fill() fails then we printed an error message and
> > returned. But we missed freeing sp810.
> > 
> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> > ---
> 
> Applied to clk-next

Thanks.
> 
> We don't need that error message on allocation failure either.

I sent another patch to remove the error message on kzalloc failure. Did
you mean that one or did you mean the error message for
of_clk_parent_fill()?
I could not find any message being printed if of_clk_parent_fill() fails
so kept it as it is.

regards
sudip

Re: [PATCH] clk: versatile: fix memory leak

[Stephen Boyd]

On 11/20, Sudip Mukherjee wrote:
> On Wed, Nov 18, 2015 at 02:24:46PM -0800, Stephen Boyd wrote:
> > On 11/16, Sudip Mukherjee wrote:
> > > If of_clk_parent_fill() fails then we printed an error message and
> > > returned. But we missed freeing sp810.
> > > 
> > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> > > ---
> > 
> > Applied to clk-next
> 
> Thanks.
> > 
> > We don't need that error message on allocation failure either.
> 
> I sent another patch to remove the error message on kzalloc failure. Did
> you mean that one or did you mean the error message for
> of_clk_parent_fill()?

Yes I meant the one you removed. Thanks.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project