lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 180/633] wilc1000: Fix memleak in wilc_sdio_probe
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 8d95ab34b21ee0f870a9185b6457e8f6eb54914c ]

    When devm_clk_get() returns -EPROBE_DEFER, sdio_priv
    should be freed just like when wilc_cfg80211_init()
    fails.

    Fixes: 8692b047e86cf ("staging: wilc1000: look for rtc_clk clock")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Acked-by: Ajay Singh <ajay.kathat@microchip.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20200820054819.23365-1-dinghao.liu@zju.edu.cn
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/wilc1000/sdio.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/wilc1000/sdio.c b/drivers/staging/wilc1000/sdio.c
    index 36eb589263bfd..b14e4ed6134fc 100644
    --- a/drivers/staging/wilc1000/sdio.c
    +++ b/drivers/staging/wilc1000/sdio.c
    @@ -151,9 +151,10 @@ static int wilc_sdio_probe(struct sdio_func *func,
    wilc->dev = &func->dev;

    wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc");
    - if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
    + if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) {
    + kfree(sdio_priv);
    return -EPROBE_DEFER;
    - else if (!IS_ERR(wilc->rtc_clk))
    + } else if (!IS_ERR(wilc->rtc_clk))
    clk_prepare_enable(wilc->rtc_clk);

    dev_info(&func->dev, "Driver Initializing success\n");
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:18    [W:3.226 / U:1.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site