| Message ID | 20201113131623.2098222-1-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | clk: ti: Fix memleak in ti_fapll_synth_setup | expand |
* Zhang Qilong <zhangqilong3@huawei.com> [201113 13:13]: > 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> Acked-by: Tony Lindgren <tony@atomide.com>
Quoting Zhang Qilong (2020-11-13 05:16:23) > 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> > --- Applied to clk-next
diff --git a/drivers/clk/ti/fapll.c b/drivers/clk/ti/fapll.c index 95e36ba64acc..8024c6d2b9e9 100644 --- a/drivers/clk/ti/fapll.c +++ b/drivers/clk/ti/fapll.c @@ -498,6 +498,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) @@ -520,13 +521,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)
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> --- drivers/clk/ti/fapll.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)