lkml.org 
[lkml]   [2019]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v2] clocksource/drivers: Fix memory leak in ttc_setup_clockevent
    From
    Date
    On 23. 10. 19 6:31, Navid Emamdoost wrote:
    > In the implementation of ttc_setup_clockevent() release the allocated
    > memory for ttcce if clk_notifier_register() fails.
    >
    > Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
    > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    > ---
    > Changes in v2:
    > - Added goto label for error handling
    > - Update description and fix typo
    >
    > drivers/clocksource/timer-cadence-ttc.c | 19 ++++++++++---------
    > 1 file changed, 10 insertions(+), 9 deletions(-)
    >
    > diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
    > index 88fe2e9ba9a3..0caacbc67102 100644
    > --- a/drivers/clocksource/timer-cadence-ttc.c
    > +++ b/drivers/clocksource/timer-cadence-ttc.c
    > @@ -411,10 +411,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 release_ttcce;
    >
    > ttcce->ttc.clk_rate_change_nb.notifier_call =
    > ttc_rate_change_clockevent_cb;
    > @@ -424,7 +422,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 release_ttcce;
    > }
    >
    > ttcce->ttc.freq = clk_get_rate(ttcce->ttc.clk);
    > @@ -453,15 +451,18 @@ 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 release_ttcce;
    >
    > clockevents_config_and_register(&ttcce->ce,
    > ttcce->ttc.freq / PRESCALE, 1, 0xfffe);
    >
    > return 0;
    > +
    > +release_ttcce:
    > +
    > + kfree(ttcce);
    > + return err;
    > }
    >
    > /**
    >

    Acked-by: Michal Simek <michal.simek@xilinx.com>

    Thanks,
    Michal

    \
     
     \ /
      Last update: 2019-10-23 09:35    [W:5.716 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site