* [PATCH] "clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
@ 2020-11-10 1:15 Yu Kuai
2020-11-10 10:04 ` Michal Simek
0 siblings, 1 reply; 8+ messages in thread
From: Yu Kuai @ 2020-11-10 1:15 UTC (permalink / raw)
To: michal.simek, daniel.lezcano, tglx, soren.brinkmann
Cc: yukuai3, zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
If clk_notifier_register() failed, ttc_setup_clockevent() will return
without freeing 'ttcce', which will leak memory.
Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/clocksource/timer-cadence-ttc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
index 80e960602030..32b9560ce408 100644
--- a/drivers/clocksource/timer-cadence-ttc.c
+++ b/drivers/clocksource/timer-cadence-ttc.c
@@ -426,6 +426,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
&ttcce->ttc.clk_rate_change_nb);
if (err) {
pr_warn("Unable to register clock notifier.\n");
+ kfree(ttcce);
return err;
}
--
2.25.4
_______________________________________________
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] 8+ messages in thread
* Re: [PATCH] "clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
2020-11-10 1:15 [PATCH] "clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent() Yu Kuai
@ 2020-11-10 10:04 ` Michal Simek
2020-11-10 10:07 ` Michal Simek
0 siblings, 1 reply; 8+ messages in thread
From: Michal Simek @ 2020-11-10 10:04 UTC (permalink / raw)
To: Yu Kuai, michal.simek, daniel.lezcano, tglx, soren.brinkmann
Cc: zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
On 10. 11. 20 2:15, Yu Kuai wrote:
> If clk_notifier_register() failed, ttc_setup_clockevent() will return
> without freeing 'ttcce', which will leak memory.
>
> Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> drivers/clocksource/timer-cadence-ttc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
> index 80e960602030..32b9560ce408 100644
> --- a/drivers/clocksource/timer-cadence-ttc.c
> +++ b/drivers/clocksource/timer-cadence-ttc.c
> @@ -426,6 +426,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
> &ttcce->ttc.clk_rate_change_nb);
> if (err) {
> pr_warn("Unable to register clock notifier.\n");
> + kfree(ttcce);
> return err;
> }
>
>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
_______________________________________________
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] 8+ messages in thread
* Re: [PATCH] "clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
2020-11-10 10:04 ` Michal Simek
@ 2020-11-10 10:07 ` Michal Simek
2020-11-11 1:16 ` [PATCH V2] clocksource/drivers/cadence_ttc: " Yu Kuai
0 siblings, 1 reply; 8+ messages in thread
From: Michal Simek @ 2020-11-10 10:07 UTC (permalink / raw)
To: Michal Simek, Yu Kuai, daniel.lezcano, tglx, soren.brinkmann
Cc: zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
On 10. 11. 20 11:04, Michal Simek wrote:
>
>
> On 10. 11. 20 2:15, Yu Kuai wrote:
>> If clk_notifier_register() failed, ttc_setup_clockevent() will return
>> without freeing 'ttcce', which will leak memory.
>>
>> Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
>> ---
>> drivers/clocksource/timer-cadence-ttc.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
>> index 80e960602030..32b9560ce408 100644
>> --- a/drivers/clocksource/timer-cadence-ttc.c
>> +++ b/drivers/clocksource/timer-cadence-ttc.c
>> @@ -426,6 +426,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
>> &ttcce->ttc.clk_rate_change_nb);
>> if (err) {
>> pr_warn("Unable to register clock notifier.\n");
>> + kfree(ttcce);
>> return err;
>> }
>>
>>
>
> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
One thing I have noticed. Please fix your subject. Remove " from it.
Thanks,
Michal
_______________________________________________
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] 8+ messages in thread
* [PATCH V2] clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
2020-11-10 10:07 ` Michal Simek
@ 2020-11-11 1:16 ` Yu Kuai
2020-11-12 9:59 ` Daniel Lezcano
0 siblings, 1 reply; 8+ messages in thread
From: Yu Kuai @ 2020-11-11 1:16 UTC (permalink / raw)
To: michal.simek, daniel.lezcano, tglx, soren.brinkmann
Cc: yukuai3, zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
If clk_notifier_register() failed, ttc_setup_clockevent() will return
without freeing 'ttcce', which will leak memory.
Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/clocksource/timer-cadence-ttc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
index 80e960602030..32b9560ce408 100644
--- a/drivers/clocksource/timer-cadence-ttc.c
+++ b/drivers/clocksource/timer-cadence-ttc.c
@@ -426,6 +426,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
&ttcce->ttc.clk_rate_change_nb);
if (err) {
pr_warn("Unable to register clock notifier.\n");
+ kfree(ttcce);
return err;
}
--
2.25.4
_______________________________________________
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] 8+ messages in thread
* Re: [PATCH V2] clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
2020-11-11 1:16 ` [PATCH V2] clocksource/drivers/cadence_ttc: " Yu Kuai
@ 2020-11-12 9:59 ` Daniel Lezcano
2020-11-16 7:08 ` [PATCH V3] " Yu Kuai
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Lezcano @ 2020-11-12 9:59 UTC (permalink / raw)
To: Yu Kuai, michal.simek, tglx, soren.brinkmann
Cc: zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
On 11/11/2020 02:16, Yu Kuai wrote:
> If clk_notifier_register() failed, ttc_setup_clockevent() will return
> without freeing 'ttcce', which will leak memory.
>
> Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
> ---
> drivers/clocksource/timer-cadence-ttc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
> index 80e960602030..32b9560ce408 100644
> --- a/drivers/clocksource/timer-cadence-ttc.c
> +++ b/drivers/clocksource/timer-cadence-ttc.c
> @@ -426,6 +426,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
> &ttcce->ttc.clk_rate_change_nb);
> if (err) {
> pr_warn("Unable to register clock notifier.\n");
> + kfree(ttcce);
> return err;
> }
Please fix the error path by adding a label (eg. out_kfree) and jump to
it in case of error everywhere in the function.
out_kfree:
kfree(ttcce);
return err;
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
_______________________________________________
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] 8+ messages in thread
* [PATCH V3] clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
2020-11-12 9:59 ` Daniel Lezcano
@ 2020-11-16 7:08 ` Yu Kuai
2020-11-16 13:51 ` [PATCH V4] " Yu Kuai
0 siblings, 1 reply; 8+ messages in thread
From: Yu Kuai @ 2020-11-16 7:08 UTC (permalink / raw)
To: michal.simek, daniel.lezcano, tglx, soren.brinkmann
Cc: yukuai3, zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
If clk_notifier_register() failed, ttc_setup_clockevent() will return
without freeing 'ttcce', which will leak memory.
Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/clocksource/timer-cadence-ttc.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
index 80e960602030..c410d1620e24 100644
--- a/drivers/clocksource/timer-cadence-ttc.c
+++ b/drivers/clocksource/timer-cadence-ttc.c
@@ -413,10 +413,8 @@ static int __init ttc_setup_clockevent(struct clk *clk,
ttcce->ttc.clk = clk;
err = clk_prepare_enable(ttcce->ttc.clk);
- if (err) {
- kfree(ttcce);
- return err;
- }
+ if (err)
+ go out_kfree;
ttcce->ttc.clk_rate_change_nb.notifier_call =
ttc_rate_change_clockevent_cb;
@@ -426,7 +424,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
&ttcce->ttc.clk_rate_change_nb);
if (err) {
pr_warn("Unable to register clock notifier.\n");
- return err;
+ goto out_kfree;
}
ttcce->ttc.freq = clk_get_rate(ttcce->ttc.clk);
@@ -455,15 +453,17 @@ static int __init ttc_setup_clockevent(struct clk *clk,
err = request_irq(irq, ttc_clock_event_interrupt,
IRQF_TIMER, ttcce->ce.name, ttcce);
- if (err) {
- kfree(ttcce);
- return err;
- }
+ if (err)
+ goto out_kfree;
clockevents_config_and_register(&ttcce->ce,
ttcce->ttc.freq / PRESCALE, 1, 0xfffe);
return 0;
+
+out_kfree:
+ kfree(ttcce);
+ return err;
}
static int __init ttc_timer_probe(struct platform_device *pdev)
--
2.25.4
_______________________________________________
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] 8+ messages in thread
* [PATCH V4] clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
2020-11-16 7:08 ` [PATCH V3] " Yu Kuai
@ 2020-11-16 13:51 ` Yu Kuai
2020-11-17 9:07 ` Daniel Lezcano
0 siblings, 1 reply; 8+ messages in thread
From: Yu Kuai @ 2020-11-16 13:51 UTC (permalink / raw)
To: michal.simek, daniel.lezcano, tglx, soren.brinkmann
Cc: yukuai3, zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
If clk_notifier_register() failed, ttc_setup_clockevent() will return
without freeing 'ttcce', which will leak memory.
Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
Changes from V3:
- fix the spelling mistake "go"->"goto", My sincere apology for this
foolish mistake.
drivers/clocksource/timer-cadence-ttc.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
index 80e960602030..c410d1620e24 100644
--- a/drivers/clocksource/timer-cadence-ttc.c
+++ b/drivers/clocksource/timer-cadence-ttc.c
@@ -413,10 +413,8 @@ static int __init ttc_setup_clockevent(struct clk *clk,
ttcce->ttc.clk = clk;
err = clk_prepare_enable(ttcce->ttc.clk);
- if (err) {
- kfree(ttcce);
- return err;
- }
+ if (err)
+ goto out_kfree;
ttcce->ttc.clk_rate_change_nb.notifier_call =
ttc_rate_change_clockevent_cb;
@@ -426,7 +424,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
&ttcce->ttc.clk_rate_change_nb);
if (err) {
pr_warn("Unable to register clock notifier.\n");
- return err;
+ goto out_kfree;
}
ttcce->ttc.freq = clk_get_rate(ttcce->ttc.clk);
@@ -455,15 +453,17 @@ static int __init ttc_setup_clockevent(struct clk *clk,
err = request_irq(irq, ttc_clock_event_interrupt,
IRQF_TIMER, ttcce->ce.name, ttcce);
- if (err) {
- kfree(ttcce);
- return err;
- }
+ if (err)
+ goto out_kfree;
clockevents_config_and_register(&ttcce->ce,
ttcce->ttc.freq / PRESCALE, 1, 0xfffe);
return 0;
+
+out_kfree:
+ kfree(ttcce);
+ return err;
}
static int __init ttc_timer_probe(struct platform_device *pdev)
--
2.25.4
_______________________________________________
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] 8+ messages in thread
* Re: [PATCH V4] clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent()
2020-11-16 13:51 ` [PATCH V4] " Yu Kuai
@ 2020-11-17 9:07 ` Daniel Lezcano
0 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2020-11-17 9:07 UTC (permalink / raw)
To: Yu Kuai, michal.simek, tglx, soren.brinkmann
Cc: zhangxiaoxu5, linux-kernel, linux-arm-kernel, yi.zhang
On 16/11/2020 14:51, Yu Kuai wrote:
> If clk_notifier_register() failed, ttc_setup_clockevent() will return
> without freeing 'ttcce', which will leak memory.
>
> Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
Applied, thanks
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
_______________________________________________
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] 8+ messages in thread
end of thread, other threads:[~2020-11-17 9:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10 1:15 [PATCH] "clocksource/drivers/cadence_ttc: fix memory leak in ttc_setup_clockevent() Yu Kuai
2020-11-10 10:04 ` Michal Simek
2020-11-10 10:07 ` Michal Simek
2020-11-11 1:16 ` [PATCH V2] clocksource/drivers/cadence_ttc: " Yu Kuai
2020-11-12 9:59 ` Daniel Lezcano
2020-11-16 7:08 ` [PATCH V3] " Yu Kuai
2020-11-16 13:51 ` [PATCH V4] " Yu Kuai
2020-11-17 9:07 ` Daniel Lezcano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).