* [PATCH] [v3] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-20 6:12 ` Dinghao Liu
0 siblings, 0 replies; 6+ messages in thread
From: Dinghao Liu @ 2020-10-20 6:12 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.
v3: - Add a new label 'err_register' to unify code style.
---
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..f2818cdd11d8 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_register;
}
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_register;
}
clk_data->num = 2;
@@ -314,6 +314,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
return;
+err_register:
+ clk_hw_unregister_fixed_rate(rtc->int_osc);
err:
kfree(clk_data);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] [v3] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-20 6:12 ` Dinghao Liu
0 siblings, 0 replies; 6+ messages in thread
From: Dinghao Liu @ 2020-10-20 6:12 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.
v3: - Add a new label 'err_register' to unify code style.
---
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..f2818cdd11d8 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_register;
}
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_register;
}
clk_data->num = 2;
@@ -314,6 +314,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
return;
+err_register:
+ clk_hw_unregister_fixed_rate(rtc->int_osc);
err:
kfree(clk_data);
}
--
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] [v3] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
2020-10-20 6:12 ` Dinghao Liu
@ 2020-10-28 17:44 ` Maxime Ripard
-1 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2020-10-28 17:44 UTC (permalink / raw)
To: Dinghao Liu
Cc: kjlu, Alessandro Zummo, Alexandre Belloni, Chen-Yu Tsai,
linux-rtc, linux-arm-kernel, linux-kernel
On Tue, Oct 20, 2020 at 02:12:26PM +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>
Acked-by: Maxime Ripard <mripard@kernel.org>
Maxime
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] [v3] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-28 17:44 ` Maxime Ripard
0 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2020-10-28 17:44 UTC (permalink / raw)
To: Dinghao Liu
Cc: linux-rtc, Alessandro Zummo, Alexandre Belloni, kjlu,
linux-kernel, Chen-Yu Tsai, linux-arm-kernel
On Tue, Oct 20, 2020 at 02:12:26PM +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>
Acked-by: Maxime Ripard <mripard@kernel.org>
Maxime
_______________________________________________
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: [PATCH] [v3] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
2020-10-20 6:12 ` Dinghao Liu
@ 2020-10-28 17:52 ` Alexandre Belloni
-1 siblings, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2020-10-28 17:52 UTC (permalink / raw)
To: kjlu, Dinghao Liu
Cc: Alexandre Belloni, linux-kernel, Maxime Ripard, linux-rtc,
linux-arm-kernel, Alessandro Zummo, Chen-Yu Tsai
On Tue, 20 Oct 2020 14:12:26 +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.
Applied, thanks!
[1/1] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
commit: 28d211919e422f58c1e6c900e5810eee4f1ce4c8
Best regards,
--
Alexandre Belloni <alexandre.belloni@bootlin.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] [v3] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
@ 2020-10-28 17:52 ` Alexandre Belloni
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2020-10-28 17:52 UTC (permalink / raw)
To: kjlu, Dinghao Liu
Cc: linux-rtc, Alessandro Zummo, Alexandre Belloni, linux-kernel,
Maxime Ripard, Chen-Yu Tsai, linux-arm-kernel
On Tue, 20 Oct 2020 14:12:26 +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.
Applied, thanks!
[1/1] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
commit: 28d211919e422f58c1e6c900e5810eee4f1ce4c8
Best regards,
--
Alexandre Belloni <alexandre.belloni@bootlin.com>
_______________________________________________
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-29 2:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-20 6:12 [PATCH] [v3] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init Dinghao Liu
2020-10-20 6:12 ` Dinghao Liu
2020-10-28 17:44 ` Maxime Ripard
2020-10-28 17:44 ` Maxime Ripard
2020-10-28 17:52 ` Alexandre Belloni
2020-10-28 17:52 ` Alexandre Belloni
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.