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

Commit 67e32fda authored by Yu Kuai's avatar Yu Kuai Committed by Greg Kroah-Hartman
Browse files

clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() 



[ Upstream commit eee422c46e6840a81c9db18a497b74387a557b29 ]

If clk_notifier_register() failed, ttc_setup_clockevent() will return
without freeing 'ttcce', which will leak memory.

Fixes: 70504f31 ("clocksource/drivers/cadence_ttc: Convert init function to return error")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201116135123.2164033-1-yukuai3@huawei.com


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

drivers/clocksource/cadence_ttc_timer.c

+9 −9
Original line number Diff line number Diff line
@@ -418,10 +418,8 @@ static int __init ttc_setup_clockevent(struct clk *clk, 
	ttcce->ttc.clk = clk;



	err = clk_prepare_enable(ttcce->ttc.clk);

	if (err) {

		kfree(ttcce);

		return err;

	}

	if (err)

		goto out_kfree;



	ttcce->ttc.clk_rate_change_nb.notifier_call =

		ttc_rate_change_clockevent_cb;
@@ -431,7 +429,7 @@ static int __init ttc_setup_clockevent(struct clk *clk, 
				    &ttcce->ttc.clk_rate_change_nb);

	if (err) {

		pr_warn("Unable to register clock notifier.\n");

		return err;

		goto out_kfree;

	}



	ttcce->ttc.freq = clk_get_rate(ttcce->ttc.clk);
@@ -460,15 +458,17 @@ static int __init ttc_setup_clockevent(struct clk *clk, 


	err = request_irq(irq, ttc_clock_event_interrupt,

			  IRQF_TIMER, ttcce->ce.name, ttcce);

	if (err) {

		kfree(ttcce);

		return err;

	}

	if (err)

		goto out_kfree;



	clockevents_config_and_register(&ttcce->ce,

			ttcce->ttc.freq / PRESCALE, 1, 0xfffe);



	return 0;



out_kfree:

	kfree(ttcce);

	return err;

}



/**