clocksource 4.19 fix-2
Hi Thomas,
I miss this patch since 4.17, I thought it went through tip/timers/urgent.
- Fix smatch potential leak report (Alexandre Belloni)
Thanks
-- Daniel
The following changes since commit 4451d3f59f2a6f95e5d205c2d04ea072955d080d:
clocksource/drivers/fttmr010: Fix set_next_event handler (2018-09-24
06:13:31 +0200)
are available in the git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git
clockevents/4.19-fixes
for you to fetch changes up to 52bf4a900d9cede3eb14982d0f2c5e6db6d97cc3:
clocksource/drivers/timer-atmel-pit: Properly handle error cases
(2018-09-27 12:01:45 +0200)
----------------------------------------------------------------
Alexandre Belloni (1):
clocksource/drivers/timer-atmel-pit: Properly handle error cases
drivers/clocksource/timer-atmel-pit.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
Signature · 5 lines
<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
PATCH 1/1 clocksource/drivers/timer-atmel-pit: Properly handle error cases
From: Alexandre Belloni <[email protected]>
The smatch utility reports a possible leak:
smatch warnings:drivers/clocksource/timer-atmel-pit.c:183 at91sam926x_pit_dt_init() warn: possible memory leak of 'data'
Ensure data is freed before exiting with an error.
--- drivers/clocksource/timer-atmel-pit.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/clocksource/timer-atmel-pit.c +14 -6
@@ -180,26 +180,29 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) data->base =of_iomap (node,0 );if (!data->base) {pr_err ("Could not map PIT address\n" ); -return -ENXIO ; + ret = -ENXIO ; + goto exit; } data->mck =of_clk_get (node,0 );if (IS_ERR (data->mck)) {pr_err ("Unable to get mck clk\n" ); -return PTR_ERR (data->mck); + ret =PTR_ERR (data->mck); + goto exit; } ret =clk_prepare_enable (data->mck);if (ret) {pr_err ("Unable to enable mck\n" ); -return ret; + goto exit; }/* Get the interrupts property */ data->irq =irq_of_parse_and_map (node,0 );if (!data->irq) {pr_err ("Unable to get IRQ from DT\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto exit; }/*
@@ -227,7 +230,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) ret =clocksource_register_hz (&data->clksrc, pit_rate);if (ret) {pr_err ("Failed to register clocksource\n" ); -return ret; + goto exit; }/* Set up irq handler */
@@ -236,7 +239,8 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) "at91_tick", data);if (ret) {pr_err ("Unable to setup IRQ\n" ); -return ret; +clocksource_unregister (&data->clksrc); + goto exit; }/* Set up and register clockevents */
@@ -254,6 +258,10 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)clockevents_register_device (&data->clkevt);return 0 ; + +exit: +kfree (data); +return ret; }TIMER_OF_DECLARE (at91sam926x_pit,"atmel,at91sam9260-pit" , at91sam926x_pit_dt_init);
Signature · 1 line
2.7.4