| From cd32e596f02fc981674573402c1138f616df1728 Mon Sep 17 00:00:00 2001 |
| From: Zhen Ni <zhen.ni@easystack.cn> |
| Date: Thu, 14 Aug 2025 20:33:24 +0800 |
| Subject: clocksource/drivers/clps711x: Fix resource leaks in error paths |
| |
| From: Zhen Ni <zhen.ni@easystack.cn> |
| |
| commit cd32e596f02fc981674573402c1138f616df1728 upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/clocksource/clps711x-timer.c | 23 ++++++++++++++++------- |
| 1 file changed, 16 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/clocksource/clps711x-timer.c |
| +++ b/drivers/clocksource/clps711x-timer.c |
| @@ -78,24 +78,33 @@ static int __init clps711x_timer_init(st |
| 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); |