[PATCH] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init

Chen-Yu Tsai wens at csie.org
Tue Aug 25 10:51:33 EDT 2020


On Sun, Aug 23, 2020 at 3:59 PM Dinghao Liu <dinghao.liu at 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 at 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 at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



More information about the linux-arm-kernel mailing list