lkml.org 
[lkml]   [2020]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 061/344] clocksource/drivers/bcm2835_timer: Fix memory leak of timer
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit 2052d032c06761330bca4944bb7858b00960e868 ]

    Currently when setup_irq fails the error exit path will leak the
    recently allocated timer structure. Originally the code would
    throw a panic but a later commit changed the behaviour to return
    via the err_iounmap path and hence we now have a memory leak. Fix
    this by adding a err_timer_free error path that kfree's timer.

    Addresses-Coverity: ("Resource Leak")
    Fixes: 524a7f08983d ("clocksource/drivers/bcm2835_timer: Convert init function to return error")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Link: https://lore.kernel.org/r/20191219213246.34437-1-colin.king@canonical.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clocksource/bcm2835_timer.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
    index 2b196cbfadb62..b235f446ee50f 100644
    --- a/drivers/clocksource/bcm2835_timer.c
    +++ b/drivers/clocksource/bcm2835_timer.c
    @@ -121,7 +121,7 @@ static int __init bcm2835_timer_init(struct device_node *node)
    ret = setup_irq(irq, &timer->act);
    if (ret) {
    pr_err("Can't set up timer IRQ\n");
    - goto err_iounmap;
    + goto err_timer_free;
    }

    clockevents_config_and_register(&timer->evt, freq, 0xf, 0xffffffff);
    @@ -130,6 +130,9 @@ static int __init bcm2835_timer_init(struct device_node *node)

    return 0;

    +err_timer_free:
    + kfree(timer);
    +
    err_iounmap:
    iounmap(base);
    return ret;
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-02-21 09:04    [W:4.188 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site