Skip to content

Commit fb73556

Browse files
Qinrun Daidlezcano
authored andcommitted
clocksource/drivers/davinci: Fix memory leak in davinci_timer_register when init fails
Smatch reports: drivers/clocksource/timer-davinci.c:332 davinci_timer_register() warn: 'base' from ioremap() not released on lines: 274. Fix this and other potential memory leak problems by adding a set of corresponding exit lables. Fixes: 721154f ("clocksource/drivers/davinci: Add support for clockevents") Signed-off-by: Qinrun Dai <flno@hust.edu.cn> Link: https://lore.kernel.org/r/20230413135037.1505799-1-flno@hust.edu.cn Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
1 parent b6f228e commit fb73556

1 file changed

Lines changed: 24 additions & 6 deletions

File tree

drivers/clocksource/timer-davinci.c

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,21 +257,25 @@ int __init davinci_timer_register(struct clk *clk,
257257
resource_size(&timer_cfg->reg),
258258
"davinci-timer")) {
259259
pr_err("Unable to request memory region\n");
260-
return -EBUSY;
260+
rv = -EBUSY;
261+
goto exit_clk_disable;
261262
}
262263

263264
base = ioremap(timer_cfg->reg.start, resource_size(&timer_cfg->reg));
264265
if (!base) {
265266
pr_err("Unable to map the register range\n");
266-
return -ENOMEM;
267+
rv = -ENOMEM;
268+
goto exit_mem_region;
267269
}
268270

269271
davinci_timer_init(base);
270272
tick_rate = clk_get_rate(clk);
271273

272274
clockevent = kzalloc(sizeof(*clockevent), GFP_KERNEL);
273-
if (!clockevent)
274-
return -ENOMEM;
275+
if (!clockevent) {
276+
rv = -ENOMEM;
277+
goto exit_iounmap_base;
278+
}
275279

276280
clockevent->dev.name = "tim12";
277281
clockevent->dev.features = CLOCK_EVT_FEAT_ONESHOT;
@@ -296,7 +300,7 @@ int __init davinci_timer_register(struct clk *clk,
296300
"clockevent/tim12", clockevent);
297301
if (rv) {
298302
pr_err("Unable to request the clockevent interrupt\n");
299-
return rv;
303+
goto exit_free_clockevent;
300304
}
301305

302306
davinci_clocksource.dev.rating = 300;
@@ -323,13 +327,27 @@ int __init davinci_timer_register(struct clk *clk,
323327
rv = clocksource_register_hz(&davinci_clocksource.dev, tick_rate);
324328
if (rv) {
325329
pr_err("Unable to register clocksource\n");
326-
return rv;
330+
goto exit_free_irq;
327331
}
328332

329333
sched_clock_register(davinci_timer_read_sched_clock,
330334
DAVINCI_TIMER_CLKSRC_BITS, tick_rate);
331335

332336
return 0;
337+
338+
exit_free_irq:
339+
free_irq(timer_cfg->irq[DAVINCI_TIMER_CLOCKEVENT_IRQ].start,
340+
clockevent);
341+
exit_free_clockevent:
342+
kfree(clockevent);
343+
exit_iounmap_base:
344+
iounmap(base);
345+
exit_mem_region:
346+
release_mem_region(timer_cfg->reg.start,
347+
resource_size(&timer_cfg->reg));
348+
exit_clk_disable:
349+
clk_disable_unprepare(clk);
350+
return rv;
333351
}
334352

335353
static int __init of_davinci_timer_register(struct device_node *np)

0 commit comments

Comments
 (0)