github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

clocksource/drivers/clps711x: Fix resource leaks in error paths

Browse Source 
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: 04410efbb6 ("clocksource/drivers/clps711x: Convert init function to return error")
Fixes: 2a6a8e2d90 ("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
This commit is contained in:
Zhen Ni 2025-08-14 20:33:24 +08:00 committed by Daniel Lezcano
parent 1c4b87c921
commit cd32e596f0
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/clocksource/clps711x-timer.c
View 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); unsigned int irq = irq_of_parse_and_map(np, 0);
struct clk *clock = of_clk_get(np, 0); struct clk *clock = of_clk_get(np, 0);
void __iomem *base = of_iomap(np, 0); void __iomem *base = of_iomap(np, 0);
int ret = 0;
if (!base) if (!base)
return -ENOMEM; return -ENOMEM;
if (!irq) if (!irq) {
return -EINVAL; ret = -EINVAL;
if (IS_ERR(clock)) goto unmap_io;
return PTR_ERR(clock); }
if (IS_ERR(clock)) {
ret = PTR_ERR(clock);
goto unmap_io;
}
switch (of_alias_get_id(np, "timer")) { switch (of_alias_get_id(np, "timer")) {
case CLPS711X_CLKSRC_CLOCKSOURCE: case CLPS711X_CLKSRC_CLOCKSOURCE:
clps711x_clksrc_init(clock, base); clps711x_clksrc_init(clock, base);
break; break;
case CLPS711X_CLKSRC_CLOCKEVENT: case CLPS711X_CLKSRC_CLOCKEVENT:
return _clps711x_clkevt_init(clock, base, irq); ret = _clps711x_clkevt_init(clock, base, irq);
break;
default: default:
return -EINVAL; ret = -EINVAL;
break;
} }
return 0; unmap_io:
iounmap(base);
return ret;
} }
TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init); TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);