[PATCH 4.19 195/346] clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent()

[Greg Kroah-Hartman]

From: Yu Kuai <yuku...@huawei.com>

[ Upstream commit eee422c46e6840a81c9db18a497b74387a557b29 ]

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

Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to 
return error")
Reported-by: Hulk Robot <hul...@huawei.com>
Signed-off-by: Yu Kuai <yuku...@huawei.com>
Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org>
Link: https://lore.kernel.org/r/20201116135123.2164033-1-yuku...@huawei.com
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/clocksource/cadence_ttc_timer.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/clocksource/cadence_ttc_timer.c 
b/drivers/clocksource/cadence_ttc_timer.c
index 29d51755e18b2..a7eb858a84a0f 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -419,10 +419,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;
@@ -432,7 +430,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);
@@ -461,15 +459,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;
 }
 
 /**
-- 
2.27.0