lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 124/175] clk: ti: Fix memleak in ti_fapll_synth_setup
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 8c6239f6e95f583bb763d0228e02d4dd0fb3d492 ]

    If clk_register fails, we should goto free branch
    before function returns to prevent memleak.

    Fixes: 163152cbbe321 ("clk: ti: Add support for FAPLL on dm816x")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Link: https://lore.kernel.org/r/20201113131623.2098222-1-zhangqilong3@huawei.com
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/ti/fapll.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/clk/ti/fapll.c b/drivers/clk/ti/fapll.c
    index 66a0d0ed8b550..02ff499e36536 100644
    --- a/drivers/clk/ti/fapll.c
    +++ b/drivers/clk/ti/fapll.c
    @@ -497,6 +497,7 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
    {
    struct clk_init_data *init;
    struct fapll_synth *synth;
    + struct clk *clk = ERR_PTR(-ENOMEM);

    init = kzalloc(sizeof(*init), GFP_KERNEL);
    if (!init)
    @@ -519,13 +520,19 @@ static struct clk * __init ti_fapll_synth_setup(struct fapll_data *fd,
    synth->hw.init = init;
    synth->clk_pll = pll_clk;

    - return clk_register(NULL, &synth->hw);
    + clk = clk_register(NULL, &synth->hw);
    + if (IS_ERR(clk)) {
    + pr_err("failed to register clock\n");
    + goto free;
    + }
    +
    + return clk;

    free:
    kfree(synth);
    kfree(init);

    - return ERR_PTR(-ENOMEM);
    + return clk;
    }

    static void __init ti_fapll_setup(struct device_node *node)
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:08    [W:4.065 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site