| From d6edb1532b05483f99b611dde47a3a2f14267ee4 Mon Sep 17 00:00:00 2001 |
| From: Yi Wang <wang.yi59@zte.com.cn> |
| Date: Wed, 31 Oct 2018 15:41:41 +0800 |
| Subject: clk: boston: fix possible memory leak in clk_boston_setup() |
| |
| [ Upstream commit 46fda5b5067a391912cf73bf3d32c26b6a22ad09 ] |
| |
| Smatch report warnings: |
| drivers/clk/imgtec/clk-boston.c:76 clk_boston_setup() warn: possible memory leak of 'onecell' |
| drivers/clk/imgtec/clk-boston.c:83 clk_boston_setup() warn: possible memory leak of 'onecell' |
| drivers/clk/imgtec/clk-boston.c:90 clk_boston_setup() warn: possible memory leak of 'onecell' |
| |
| 'onecell' is malloced in clk_boston_setup(), but not be freed |
| before leaving from the error handling cases. |
| |
| Signed-off-by: Yi Wang <wang.yi59@zte.com.cn> |
| Signed-off-by: Stephen Boyd <sboyd@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/clk/imgtec/clk-boston.c | 11 ++++++++--- |
| 1 file changed, 8 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/clk/imgtec/clk-boston.c b/drivers/clk/imgtec/clk-boston.c |
| index 15af423cc0c9..f5d54a64d33c 100644 |
| --- a/drivers/clk/imgtec/clk-boston.c |
| +++ b/drivers/clk/imgtec/clk-boston.c |
| @@ -73,27 +73,32 @@ static void __init clk_boston_setup(struct device_node *np) |
| hw = clk_hw_register_fixed_rate(NULL, "input", NULL, 0, in_freq); |
| if (IS_ERR(hw)) { |
| pr_err("failed to register input clock: %ld\n", PTR_ERR(hw)); |
| - return; |
| + goto error; |
| } |
| onecell->hws[BOSTON_CLK_INPUT] = hw; |
| |
| hw = clk_hw_register_fixed_rate(NULL, "sys", "input", 0, sys_freq); |
| if (IS_ERR(hw)) { |
| pr_err("failed to register sys clock: %ld\n", PTR_ERR(hw)); |
| - return; |
| + goto error; |
| } |
| onecell->hws[BOSTON_CLK_SYS] = hw; |
| |
| hw = clk_hw_register_fixed_rate(NULL, "cpu", "input", 0, cpu_freq); |
| if (IS_ERR(hw)) { |
| pr_err("failed to register cpu clock: %ld\n", PTR_ERR(hw)); |
| - return; |
| + goto error; |
| } |
| onecell->hws[BOSTON_CLK_CPU] = hw; |
| |
| err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, onecell); |
| if (err) |
| pr_err("failed to add DT provider: %d\n", err); |
| + |
| + return; |
| + |
| +error: |
| + kfree(onecell); |
| } |
| |
| /* |
| -- |
| 2.19.1 |
| |