[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250731062331.1041773-1-zhen.ni@easystack.cn>
Date: Thu, 31 Jul 2025 14:23:31 +0800
From: Zhen Ni <zhen.ni@...ystack.cn>
To: daniel.lezcano@...aro.org,
tglx@...utronix.de
Cc: linux-kernel@...r.kernel.org,
Zhen Ni <zhen.ni@...ystack.cn>
Subject: [PATCH] clocksource: clps711x: Fix resource leaks in error paths
The current implementation of clps711x_timer_init() has multiple error
paths that directly return without releasing the base I/O memory mapped
via of_iomap(). This leads to resource leaks when:
1. irq_of_parse_and_map() fails
2. of_clk_get() returns an error
3. _clps711x_clkevt_init() fails for CLOCKEVENT alias
4. An unrecognized timer alias is provided
Signed-off-by: Zhen Ni <zhen.ni@...ystack.cn>
---
drivers/clocksource/clps711x-timer.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c
index e95fdc49c226..f803d694c7a4 100644
--- a/drivers/clocksource/clps711x-timer.c
+++ b/drivers/clocksource/clps711x-timer.c
@@ -78,24 +78,34 @@ static int __init clps711x_timer_init(struct device_node *np)
unsigned int irq = irq_of_parse_and_map(np, 0);
struct clk *clock = of_clk_get(np, 0);
void __iomem *base = of_iomap(np, 0);
+ int ret = 0;
if (!base)
return -ENOMEM;
- if (!irq)
- return -EINVAL;
- if (IS_ERR(clock))
- return PTR_ERR(clock);
+ if (!irq) {
+ ret = -EINVAL;
+ goto out;
+ }
+ if (IS_ERR(clock)) {
+ ret = PTR_ERR(clock);
+ goto out;
+ }
switch (of_alias_get_id(np, "timer")) {
case CLPS711X_CLKSRC_CLOCKSOURCE:
clps711x_clksrc_init(clock, base);
break;
case CLPS711X_CLKSRC_CLOCKEVENT:
- return _clps711x_clkevt_init(clock, base, irq);
+ ret = _clps711x_clkevt_init(clock, base, irq);
+ break;
default:
- return -EINVAL;
+ ret = -EINVAL;
+ break;
}
- return 0;
+out:
+ if (base)
+ iounmap(base);
+ return ret;
}
TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);
--
2.20.1
Powered by blists - more mailing lists