diff mbox series

rtc: sun6i: Fix memleak in sun6i_rtc_clk_init

Message ID 20200823075815.23457-1-dinghao.liu@zju.edu.cn
State New
Headers show
Series rtc: sun6i: Fix memleak in sun6i_rtc_clk_init | expand

Commit Message

Dinghao Liu Aug. 23, 2020, 7:58 a.m. UTC
When clk_hw_register_fixed_rate_with_accuracy() fails,
clk_data should be freed. It's the same for the subsequent
error paths.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
 drivers/rtc/rtc-sun6i.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Chen-Yu Tsai Aug. 25, 2020, 2:51 p.m. UTC | #1
On Sun, Aug 23, 2020 at 3:59 PM Dinghao Liu <dinghao.liu@zju.edu.cn> wrote:
>
> When clk_hw_register_fixed_rate_with_accuracy() fails,
> clk_data should be freed. It's the same for the subsequent
> error paths.

I suppose you should also unregister the already registered clocks
in the latter two error paths?

> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
>  drivers/rtc/rtc-sun6i.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
> index e2b8b150bcb4..a837c5a40508 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,7 @@ 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;
> +               goto err;
>         }
>
>         of_property_read_string_index(node, "clock-output-names", 1,
> @@ -301,7 +301,7 @@ 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;
> +               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
Dinghao Liu Aug. 26, 2020, 8:55 a.m. UTC | #2
> On Sun, Aug 23, 2020 at 3:59 PM Dinghao Liu <dinghao.liu@zju.edu.cn> wrote:
> >
> > When clk_hw_register_fixed_rate_with_accuracy() fails,
> > clk_data should be freed. It's the same for the subsequent
> > error paths.
> 
> I suppose you should also unregister the already registered clocks
> in the latter two error paths?
> 

Sounds reasonable. But I find that the existing kernel code takes different
strategies for this case. of_sama5d4_sckc_setup() uses clk_hw_unregister() 
after clk_hw_register_fixed_rate_with_accuracy(), while _of_fixed_clk_setup()
uses clk_hw_unregister_fixed_rate(). But at91sam926x_pmc_setup() just does
nothing in this case.

Also, tcon_ch1_setup() uses clk_unregister() after clk_register(), while
clk_register_vco_pll() just does nothing. 

So I'm not sure if we should register here and which unregister function to 
use. Would you please give me more specific advice about this problem?

Regards,
Dinghao
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index e2b8b150bcb4..a837c5a40508 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,7 @@  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;
+		goto err;
 	}
 
 	of_property_read_string_index(node, "clock-output-names", 1,
@@ -301,7 +301,7 @@  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;
+		goto err;
 	}
 
 	clk_data->num = 2;