lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 046/109] rtc: brcmstb-waketimer: fix error handling in brcmstb_waketmr_probe()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexey Khoroshilov <khoroshilov@ispras.ru>


    [ Upstream commit f2eef045de9defbc6fc6b72b17f0941cbe26c81d ]

    brcmstb_waketmr_probe() does not disable timer->clk on error paths.

    Found by Linux Driver Verification project (linuxtesting.org).

    Fixes: c4f07ecee22e ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
    Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/rtc/rtc-brcmstb-waketimer.c | 15 ++++++++++++---
    1 file changed, 12 insertions(+), 3 deletions(-)

    --- a/drivers/rtc/rtc-brcmstb-waketimer.c
    +++ b/drivers/rtc/rtc-brcmstb-waketimer.c
    @@ -253,7 +253,7 @@ static int brcmstb_waketmr_probe(struct
    ret = devm_request_irq(dev, timer->irq, brcmstb_waketmr_irq, 0,
    "brcmstb-waketimer", timer);
    if (ret < 0)
    - return ret;
    + goto err_clk;

    timer->reboot_notifier.notifier_call = brcmstb_waketmr_reboot;
    register_reboot_notifier(&timer->reboot_notifier);
    @@ -262,12 +262,21 @@ static int brcmstb_waketmr_probe(struct
    &brcmstb_waketmr_ops, THIS_MODULE);
    if (IS_ERR(timer->rtc)) {
    dev_err(dev, "unable to register device\n");
    - unregister_reboot_notifier(&timer->reboot_notifier);
    - return PTR_ERR(timer->rtc);
    + ret = PTR_ERR(timer->rtc);
    + goto err_notifier;
    }

    dev_info(dev, "registered, with irq %d\n", timer->irq);

    + return 0;
    +
    +err_notifier:
    + unregister_reboot_notifier(&timer->reboot_notifier);
    +
    +err_clk:
    + if (timer->clk)
    + clk_disable_unprepare(timer->clk);
    +
    return ret;
    }


    \
     
     \ /
      Last update: 2018-03-16 17:45    [W:2.841 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site