All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-18  7:28 ` Dinghao Liu
  0 siblings, 0 replies; 6+ messages in thread
From: Dinghao Liu @ 2020-10-18  7:28 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Alessandro Zummo, Alexandre Belloni, Maxime Ripard, Chen-Yu Tsai,
	linux-rtc, linux-arm-kernel, linux-kernel

When clk_hw_register_fixed_rate_with_accuracy() fails,
clk_data should be freed. It's the same for the subsequent
two error paths, but we should also unregister the already
registered clocks in them.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---

Changelog:

v2: - Unregister the already registered clocks on failure.
---
 drivers/rtc/rtc-sun6i.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index e2b8b150bcb4..6de0d3ad736a 100644
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -272,7 +272,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 								300000000);
 	if (IS_ERR(rtc->int_osc)) {
 		pr_crit("Couldn't register the internal oscillator\n");
-		return;
+		goto err;
 	}
 
 	parents[0] = clk_hw_get_name(rtc->int_osc);
@@ -290,7 +290,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 	rtc->losc = clk_register(NULL, &rtc->hw);
 	if (IS_ERR(rtc->losc)) {
 		pr_crit("Couldn't register the LOSC clock\n");
-		return;
+		clk_hw_unregister_fixed_rate(rtc->int_osc);
+		goto err;
 	}
 
 	of_property_read_string_index(node, "clock-output-names", 1,
@@ -301,7 +302,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 					  &rtc->lock);
 	if (IS_ERR(rtc->ext_losc)) {
 		pr_crit("Couldn't register the LOSC external gate\n");
-		return;
+		clk_hw_unregister_fixed_rate(rtc->int_osc);
+		goto err;
 	}
 
 	clk_data->num = 2;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-18  7:28 ` Dinghao Liu
  0 siblings, 0 replies; 6+ messages in thread
From: Dinghao Liu @ 2020-10-18  7:28 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: linux-rtc, Alessandro Zummo, Alexandre Belloni, linux-kernel,
	Maxime Ripard, Chen-Yu Tsai, linux-arm-kernel

When clk_hw_register_fixed_rate_with_accuracy() fails,
clk_data should be freed. It's the same for the subsequent
two error paths, but we should also unregister the already
registered clocks in them.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---

Changelog:

v2: - Unregister the already registered clocks on failure.
---
 drivers/rtc/rtc-sun6i.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index e2b8b150bcb4..6de0d3ad736a 100644
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -272,7 +272,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 								300000000);
 	if (IS_ERR(rtc->int_osc)) {
 		pr_crit("Couldn't register the internal oscillator\n");
-		return;
+		goto err;
 	}
 
 	parents[0] = clk_hw_get_name(rtc->int_osc);
@@ -290,7 +290,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 	rtc->losc = clk_register(NULL, &rtc->hw);
 	if (IS_ERR(rtc->losc)) {
 		pr_crit("Couldn't register the LOSC clock\n");
-		return;
+		clk_hw_unregister_fixed_rate(rtc->int_osc);
+		goto err;
 	}
 
 	of_property_read_string_index(node, "clock-output-names", 1,
@@ -301,7 +302,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 					  &rtc->lock);
 	if (IS_ERR(rtc->ext_losc)) {
 		pr_crit("Couldn't register the LOSC external gate\n");
-		return;
+		clk_hw_unregister_fixed_rate(rtc->int_osc);
+		goto err;
 	}
 
 	clk_data->num = 2;
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
  2020-10-18  7:28 ` Dinghao Liu
@ 2020-10-19  8:02   ` Maxime Ripard
  -1 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2020-10-19  8:02 UTC (permalink / raw)
  To: Dinghao Liu
  Cc: kjlu, Alessandro Zummo, Alexandre Belloni, Chen-Yu Tsai,
	linux-rtc, linux-arm-kernel, linux-kernel

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

Hi,

On Sun, Oct 18, 2020 at 03:28:10PM +0800, Dinghao Liu wrote:
> When clk_hw_register_fixed_rate_with_accuracy() fails,
> clk_data should be freed. It's the same for the subsequent
> two error paths, but we should also unregister the already
> registered clocks in them.
> 
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
> 
> Changelog:
> 
> v2: - Unregister the already registered clocks on failure.
> ---
>  drivers/rtc/rtc-sun6i.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
> index e2b8b150bcb4..6de0d3ad736a 100644
> --- a/drivers/rtc/rtc-sun6i.c
> +++ b/drivers/rtc/rtc-sun6i.c
> @@ -272,7 +272,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
>  								300000000);
>  	if (IS_ERR(rtc->int_osc)) {
>  		pr_crit("Couldn't register the internal oscillator\n");
> -		return;
> +		goto err;
>  	}
>  
>  	parents[0] = clk_hw_get_name(rtc->int_osc);
> @@ -290,7 +290,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
>  	rtc->losc = clk_register(NULL, &rtc->hw);
>  	if (IS_ERR(rtc->losc)) {
>  		pr_crit("Couldn't register the LOSC clock\n");
> -		return;
> +		clk_hw_unregister_fixed_rate(rtc->int_osc);
> +		goto err;
>  	}

The point of having labels for the error sequence is to avoid to
duplicate the error handling code in each and every error code path.

You should add another label for the fixed rate clock unregistration

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-19  8:02   ` Maxime Ripard
  0 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2020-10-19  8:02 UTC (permalink / raw)
  To: Dinghao Liu
  Cc: linux-rtc, Alessandro Zummo, Alexandre Belloni, kjlu,
	linux-kernel, Chen-Yu Tsai, linux-arm-kernel


[-- Attachment #1.1: Type: text/plain, Size: 1531 bytes --]

Hi,

On Sun, Oct 18, 2020 at 03:28:10PM +0800, Dinghao Liu wrote:
> When clk_hw_register_fixed_rate_with_accuracy() fails,
> clk_data should be freed. It's the same for the subsequent
> two error paths, but we should also unregister the already
> registered clocks in them.
> 
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
> 
> Changelog:
> 
> v2: - Unregister the already registered clocks on failure.
> ---
>  drivers/rtc/rtc-sun6i.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
> index e2b8b150bcb4..6de0d3ad736a 100644
> --- a/drivers/rtc/rtc-sun6i.c
> +++ b/drivers/rtc/rtc-sun6i.c
> @@ -272,7 +272,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
>  								300000000);
>  	if (IS_ERR(rtc->int_osc)) {
>  		pr_crit("Couldn't register the internal oscillator\n");
> -		return;
> +		goto err;
>  	}
>  
>  	parents[0] = clk_hw_get_name(rtc->int_osc);
> @@ -290,7 +290,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
>  	rtc->losc = clk_register(NULL, &rtc->hw);
>  	if (IS_ERR(rtc->losc)) {
>  		pr_crit("Couldn't register the LOSC clock\n");
> -		return;
> +		clk_hw_unregister_fixed_rate(rtc->int_osc);
> +		goto err;
>  	}

The point of having labels for the error sequence is to avoid to
duplicate the error handling code in each and every error code path.

You should add another label for the fixed rate clock unregistration

Maxime

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Re: [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
  2020-10-19  8:02   ` Maxime Ripard
@ 2020-10-20  5:53     ` dinghao.liu
  -1 siblings, 0 replies; 6+ messages in thread
From: dinghao.liu @ 2020-10-20  5:53 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: kjlu, Alessandro Zummo, Alexandre Belloni, Chen-Yu Tsai,
	linux-rtc, linux-arm-kernel, linux-kernel

> Hi,
> 
> On Sun, Oct 18, 2020 at 03:28:10PM +0800, Dinghao Liu wrote:
> > When clk_hw_register_fixed_rate_with_accuracy() fails,
> > clk_data should be freed. It's the same for the subsequent
> > two error paths, but we should also unregister the already
> > registered clocks in them.
> > 
> > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> > ---
> > 
> > Changelog:
> > 
> > v2: - Unregister the already registered clocks on failure.
> > ---
> >  drivers/rtc/rtc-sun6i.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
> > index e2b8b150bcb4..6de0d3ad736a 100644
> > --- a/drivers/rtc/rtc-sun6i.c
> > +++ b/drivers/rtc/rtc-sun6i.c
> > @@ -272,7 +272,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
> >  								300000000);
> >  	if (IS_ERR(rtc->int_osc)) {
> >  		pr_crit("Couldn't register the internal oscillator\n");
> > -		return;
> > +		goto err;
> >  	}
> >  
> >  	parents[0] = clk_hw_get_name(rtc->int_osc);
> > @@ -290,7 +290,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
> >  	rtc->losc = clk_register(NULL, &rtc->hw);
> >  	if (IS_ERR(rtc->losc)) {
> >  		pr_crit("Couldn't register the LOSC clock\n");
> > -		return;
> > +		clk_hw_unregister_fixed_rate(rtc->int_osc);
> > +		goto err;
> >  	}
> 
> The point of having labels for the error sequence is to avoid to
> duplicate the error handling code in each and every error code path.
> 
> You should add another label for the fixed rate clock unregistration
> 

Fine, I will fix this soon.

Regards,
Dinghao

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Re: [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-20  5:53     ` dinghao.liu
  0 siblings, 0 replies; 6+ messages in thread
From: dinghao.liu @ 2020-10-20  5:53 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: linux-rtc, Alessandro Zummo, Alexandre Belloni, kjlu,
	linux-kernel, Chen-Yu Tsai, linux-arm-kernel

> Hi,
> 
> On Sun, Oct 18, 2020 at 03:28:10PM +0800, Dinghao Liu wrote:
> > When clk_hw_register_fixed_rate_with_accuracy() fails,
> > clk_data should be freed. It's the same for the subsequent
> > two error paths, but we should also unregister the already
> > registered clocks in them.
> > 
> > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> > ---
> > 
> > Changelog:
> > 
> > v2: - Unregister the already registered clocks on failure.
> > ---
> >  drivers/rtc/rtc-sun6i.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
> > index e2b8b150bcb4..6de0d3ad736a 100644
> > --- a/drivers/rtc/rtc-sun6i.c
> > +++ b/drivers/rtc/rtc-sun6i.c
> > @@ -272,7 +272,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
> >  								300000000);
> >  	if (IS_ERR(rtc->int_osc)) {
> >  		pr_crit("Couldn't register the internal oscillator\n");
> > -		return;
> > +		goto err;
> >  	}
> >  
> >  	parents[0] = clk_hw_get_name(rtc->int_osc);
> > @@ -290,7 +290,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
> >  	rtc->losc = clk_register(NULL, &rtc->hw);
> >  	if (IS_ERR(rtc->losc)) {
> >  		pr_crit("Couldn't register the LOSC clock\n");
> > -		return;
> > +		clk_hw_unregister_fixed_rate(rtc->int_osc);
> > +		goto err;
> >  	}
> 
> The point of having labels for the error sequence is to avoid to
> duplicate the error handling code in each and every error code path.
> 
> You should add another label for the fixed rate clock unregistration
> 

Fine, I will fix this soon.

Regards,
Dinghao
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-20  5:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-18  7:28 [PATCH] [v2] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init Dinghao Liu
2020-10-18  7:28 ` Dinghao Liu
2020-10-19  8:02 ` Maxime Ripard
2020-10-19  8:02   ` Maxime Ripard
2020-10-20  5:53   ` dinghao.liu
2020-10-20  5:53     ` dinghao.liu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.