Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54cc10a0 authored by Feng Mingxi's avatar Feng Mingxi Committed by Greg Kroah-Hartman
Browse files

clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe 



[ Upstream commit 8b5bf64c89c7100c921bd807ba39b2eb003061ab ]

Smatch reports:
drivers/clocksource/timer-cadence-ttc.c:529 ttc_timer_probe()
warn: 'timer_baseaddr' from of_iomap() not released on lines: 498,508,516.

timer_baseaddr may have the problem of not being released after use,
I replaced it with the devm_of_iomap() function and added the clk_put()
function to cleanup the "clk_ce" and "clk_cs".

Fixes: e932900a ("arm: zynq: Use standard timer binding")
Fixes: 70504f31 ("clocksource/drivers/cadence_ttc: Convert init function to return error")
Signed-off-by: default avatarFeng Mingxi <m202271825@hust.edu.cn>
Reviewed-by: default avatarDongliang Mu <dzm91@hust.edu.cn>
Acked-by: default avatarMichal Simek <michal.simek@amd.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230425065611.702917-1-m202271825@hust.edu.cn


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 38ca169d

drivers/clocksource/timer-cadence-ttc.c

+13 −6
Original line number Diff line number Diff line
@@ -486,10 +486,10 @@ static int __init ttc_timer_probe(struct platform_device *pdev) 
	 * and use it. Note that the event timer uses the interrupt and it's the

	 * 2nd TTC hence the irq_of_parse_and_map(,1)

	 */

	timer_baseaddr = of_iomap(timer, 0);

	if (!timer_baseaddr) {

	timer_baseaddr = devm_of_iomap(&pdev->dev, timer, 0, NULL);

	if (IS_ERR(timer_baseaddr)) {

		pr_err("ERROR: invalid timer base address\n");

		return -ENXIO;

		return PTR_ERR(timer_baseaddr);

	}



	irq = irq_of_parse_and_map(timer, 1);
@@ -513,20 +513,27 @@ static int __init ttc_timer_probe(struct platform_device *pdev) 
	clk_ce = of_clk_get(timer, clksel);

	if (IS_ERR(clk_ce)) {

		pr_err("ERROR: timer input clock not found\n");

		return PTR_ERR(clk_ce);

		ret = PTR_ERR(clk_ce);

		goto put_clk_cs;

	}



	ret = ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width);

	if (ret)

		return ret;

		goto put_clk_ce;



	ret = ttc_setup_clockevent(clk_ce, timer_baseaddr + 4, irq);

	if (ret)

		return ret;

		goto put_clk_ce;



	pr_info("%pOFn #0 at %p, irq=%d\n", timer, timer_baseaddr, irq);



	return 0;



put_clk_ce:

	clk_put(clk_ce);

put_clk_cs:

	clk_put(clk_cs);

	return ret;

}



static const struct of_device_id ttc_timer_of_match[] = {