[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <5f1ba3fb1950a2743ec8c4baa4b4925f134c0f28.1619157996.git.christophe.jaillet@wanadoo.fr>
Date: Fri, 23 Apr 2021 08:25:10 +0200
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: mturquette@...libre.com, sboyd@...nel.org,
gregory.clement@...tlin.com, thomas.petazzoni@...e-electrons.com
Cc: linux-clk@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org,
Christophe JAILLET <christophe.jaillet@...adoo.fr>
Subject: [PATCH 2/4] clk: mvebu: Fix a another memory leak in an error handling path
If we exit the for_each_of_cpu_node loop early, the reference on the
current node must be decremented, otherwise there is a leak.
Fixes: ab8ba01b3fe5 ("clk: mvebu: add armada-370-xp CPU specific clocks")
Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
---
drivers/clk/mvebu/clk-cpu.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index a11d7273fcc7..9a5c2aec6ec2 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -199,11 +199,14 @@ static void __init of_cpu_clk_setup(struct device_node *node)
int cpu, err;
err = of_property_read_u32(dn, "reg", &cpu);
- if (WARN_ON(err))
+ if (WARN_ON(err)) {
+ of_node_put(dn);
goto bail_out;
+ }
clk_name = kasprintf(GFP_KERNEL, "cpu%d", cpu);
if (WARN_ON(!clk_name)) {
+ of_node_put(dn);
goto bail_out;
}
@@ -222,8 +225,10 @@ static void __init of_cpu_clk_setup(struct device_node *node)
init.num_parents = 1;
clk = clk_register(NULL, &cpuclk[cpu].hw);
- if (WARN_ON(IS_ERR(clk)))
+ if (WARN_ON(IS_ERR(clk))) {
+ of_node_put(dn);
goto bail_out;
+ }
clks[cpu] = clk;
}
clk_data.clk_num = MAX_CPU;
--
2.27.0
Powered by blists - more mailing lists