[PATCH] clocksource/drivers/timer-imx-gpt: fix resource leak on init error paths
DORMANTno replies
From: Haotian Zhang <hidden>
Date: 2026-10-08 17:36:03
Also in:
imx, lkml
Subsystem:
clocksource, clockevent drivers, the rest · Maintainers:
Daniel Lezcano, Thomas Gleixner, Linus Torvalds
mxc_timer_init_dt() maps the timer registers with of_iomap() and obtains
the ipg and per clocks with of_clk_get_by_name(), but every error path
jumps to err_kfree, which only frees the imx_timer structure. The
ioremap'd mapping and the clock references are therefore leaked when
irq_of_parse_and_map() or _mxc_timer_init() fails.
Unmap the I/O region and release the clocks on those error paths.
Fixes: 8051a993ce22 ("clocksource/drivers/timer-imx-gpt: Fix potential memory leak")
Assisted-by: DeepSeek-V4.1-Flash
Signed-off-by: Haotian Zhang <redacted>
---
drivers/clocksource/timer-imx-gpt.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 8335bd7f8c6c..b8005054b30a 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c@@ -441,7 +441,7 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t imxtm->irq = irq_of_parse_and_map(np, 0); if (imxtm->irq <= 0) { ret = -EINVAL; - goto err_kfree; + goto err_unmap; } imxtm->clk_ipg = of_clk_get_by_name(np, "ipg");
@@ -455,12 +455,19 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t ret = _mxc_timer_init(imxtm); if (ret) - goto err_kfree; + goto err_clk_put; initialized = 1; return 0; +err_clk_put: + if (!IS_ERR_OR_NULL(imxtm->clk_per)) + clk_put(imxtm->clk_per); + if (!IS_ERR_OR_NULL(imxtm->clk_ipg)) + clk_put(imxtm->clk_ipg); +err_unmap: + iounmap(imxtm->base); err_kfree: kfree(imxtm); return ret;
--
2.25.1