]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clocksource/drivers/clps711x: Fix resource leaks in error paths
authorZhen Ni <zhen.ni@easystack.cn>
Thu, 14 Aug 2025 12:33:24 +0000 (20:33 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 23 Sep 2025 10:42:27 +0000 (12:42 +0200)
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(). Fix of_iomap leaks in error paths.

Fixes: 04410efbb6bc ("clocksource/drivers/clps711x: Convert init function to return error")
Fixes: 2a6a8e2d9004 ("clocksource/drivers/clps711x: Remove board support")
Signed-off-by: Zhen Ni <zhen.ni@easystack.cn>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250814123324.1516495-1-zhen.ni@easystack.cn
drivers/clocksource/clps711x-timer.c

index e95fdc49c2269c1702e230b0f8367ba443886ace..bbceb0289d457a90f563b574a515bfd4b8f5e368 100644 (file)
@@ -78,24 +78,33 @@ 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 unmap_io;
+       }
+       if (IS_ERR(clock)) {
+               ret = PTR_ERR(clock);
+               goto unmap_io;
+       }
 
        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;
+unmap_io:
+       iounmap(base);
+       return ret;
 }
 TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);