diff mbox series

clk: socfpga: Fix memory leak in socfpga_gate_init()

Message ID 20221123031622.63171-1-xiujianfeng@huawei.com
State New
Headers
Series clk: socfpga: Fix memory leak in socfpga_gate_init() |

Commit Message

Xiu Jianfeng Nov. 23, 2022, 3:16 a.m. UTC 
  Free @socfpga_clk and @ops on the error path to avoid memory leak issue.

Fixes: a30a67be7b6e ("clk: socfpga: Don't have get_parent for single parent ops")
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
 drivers/clk/socfpga/clk-gate.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Dinh Nguyen Dec. 1, 2022, 4:36 p.m. UTC | #1 
On 11/22/22 21:16, Xiu Jianfeng wrote:
> Free @socfpga_clk and @ops on the error path to avoid memory leak issue.
> 
> Fixes: a30a67be7b6e ("clk: socfpga: Don't have get_parent for single parent ops")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
>   drivers/clk/socfpga/clk-gate.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
> index 3e347b9e9eff..0c18c55edf8c 100644
> --- a/drivers/clk/socfpga/clk-gate.c
> +++ b/drivers/clk/socfpga/clk-gate.c
> @@ -133,8 +133,10 @@ void __init socfpga_gate_init(struct device_node *node)
>   		return;
>   
>   	ops = kmemdup(&gateclk_ops, sizeof(gateclk_ops), GFP_KERNEL);
> -	if (WARN_ON(!ops))
> +	if (WARN_ON(!ops)) {
> +		kfree(socfpga_clk);
>   		return;
> +	}
>   
>   	rc = of_property_read_u32_array(node, "clk-gate", clk_gate, 2);
>   	if (rc)
> @@ -182,6 +184,7 @@ void __init socfpga_gate_init(struct device_node *node)
>   
>   	err = clk_hw_register(NULL, hw_clk);
>   	if (err) {
> +		kfree(ops);
>   		kfree(socfpga_clk);
>   		return;
>   	}

Acked-by: Dinh Nguyen <dinguyen@kernel.org>
Stephen Boyd Dec. 9, 2022, 1:16 a.m. UTC | #2 
Quoting Xiu Jianfeng (2022-11-22 19:16:22)
> Free @socfpga_clk and @ops on the error path to avoid memory leak issue.
> 
> Fixes: a30a67be7b6e ("clk: socfpga: Don't have get_parent for single parent ops")
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---

Applied to clk-next
diff mbox series

Patch

diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
index 3e347b9e9eff..0c18c55edf8c 100644
--- a/drivers/clk/socfpga/clk-gate.c
+++ b/drivers/clk/socfpga/clk-gate.c
@@ -133,8 +133,10 @@  void __init socfpga_gate_init(struct device_node *node)
 		return;
 
 	ops = kmemdup(&gateclk_ops, sizeof(gateclk_ops), GFP_KERNEL);
-	if (WARN_ON(!ops))
+	if (WARN_ON(!ops)) {
+		kfree(socfpga_clk);
 		return;
+	}
 
 	rc = of_property_read_u32_array(node, "clk-gate", clk_gate, 2);
 	if (rc)
@@ -182,6 +184,7 @@  void __init socfpga_gate_init(struct device_node *node)
 
 	err = clk_hw_register(NULL, hw_clk);
 	if (err) {
+		kfree(ops);
 		kfree(socfpga_clk);
 		return;
 	}