lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 032/477] rtc: mc13xxx: fix a double-unlock issue
    Date
    From: Qiushi Wu <wu000273@umn.edu>

    [ Upstream commit 8816cd726a4fee197af2d851cbe25991ae19ea14 ]

    In function mc13xxx_rtc_probe, the mc13xxx_unlock() is called
    before rtc_register_device(). But in the error path of
    rtc_register_device(), the mc13xxx_unlock() is called again,
    which causes a double-unlock problem. Thus add a call of the
    function “mc13xxx_lock” in an if branch for the completion
    of the exception handling.

    Fixes: e4ae7023e182a ("rtc: mc13xxx: set range")
    Signed-off-by: Qiushi Wu <wu000273@umn.edu>
    Link: https://lore.kernel.org/r/20200503182235.1652-1-wu000273@umn.edu
    Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/rtc/rtc-mc13xxx.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
    index afce2c0b4bd67..d6802e6191cbe 100644
    --- a/drivers/rtc/rtc-mc13xxx.c
    +++ b/drivers/rtc/rtc-mc13xxx.c
    @@ -308,8 +308,10 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
    mc13xxx_unlock(mc13xxx);

    ret = rtc_register_device(priv->rtc);
    - if (ret)
    + if (ret) {
    + mc13xxx_lock(mc13xxx);
    goto err_irq_request;
    + }

    return 0;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:02    [W:4.423 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site