linux-kernel - [PATCH v3 1/8] clk: versaclock3: Fix NULL pointer dereference in error path

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20260203135139.28151-2-ovidiu.panait.rb@renesas.com>
Date: Tue,  3 Feb 2026 13:51:32 +0000
From: Ovidiu Panait <ovidiu.panait.rb@...esas.com>
To: geert+renesas@...der.be,
	magnus.damm@...il.com,
	robh@...nel.org,
	krzk+dt@...nel.org,
	conor+dt@...nel.org,
	mturquette@...libre.com,
	sboyd@...nel.org,
	biju.das.jz@...renesas.com,
	fabrizio.castro.jz@...esas.com
Cc: linux-renesas-soc@...r.kernel.org,
	devicetree@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-clk@...r.kernel.org
Subject: [PATCH v3 1/8] clk: versaclock3: Fix NULL pointer dereference in error path

If devm_clk_hw_register() fails, the driver logs an error using
hw.init->name. However, the clock core sets hw->init to NULL in
__clk_register() immediately after registration, regardless of
success or failure. This leads to a NULL pointer dereference.

To fix this, save the clock name before registration and use the
saved pointer in the error message. While at it, improve the error
message to make it more clear.

Fixes: 6e9aff555db7 ("clk: Add support for versa3 clock driver")
Signed-off-by: Ovidiu Panait <ovidiu.panait.rb@...esas.com>
---
v3 changes: New patch.

 drivers/clk/clk-versaclock3.c | 36 +++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/drivers/clk/clk-versaclock3.c b/drivers/clk/clk-versaclock3.c
index 27b6cf70f3ae..6dcf3d94db7b 100644
--- a/drivers/clk/clk-versaclock3.c
+++ b/drivers/clk/clk-versaclock3.c
@@ -1031,19 +1031,23 @@ static int vc3_probe(struct i2c_client *client)
 	/* Register pfd muxes */
 	for (i = 0; i < ARRAY_SIZE(clk_pfd_mux); i++) {
 		clk_pfd_mux[i].regmap = regmap;
+		name = clk_pfd_mux[i].hw.init->name;
 		ret = devm_clk_hw_register(dev, &clk_pfd_mux[i].hw);
 		if (ret)
-			return dev_err_probe(dev, ret, "%s failed\n",
-					     clk_pfd_mux[i].hw.init->name);
+			return dev_err_probe(dev, ret,
+					     "failed to register clock %s\n",
+					     name);
 	}
 
 	/* Register pfd's */
 	for (i = 0; i < ARRAY_SIZE(clk_pfd); i++) {
 		clk_pfd[i].regmap = regmap;
+		name = clk_pfd[i].hw.init->name;
 		ret = devm_clk_hw_register(dev, &clk_pfd[i].hw);
 		if (ret)
-			return dev_err_probe(dev, ret, "%s failed\n",
-					     clk_pfd[i].hw.init->name);
+			return dev_err_probe(dev, ret,
+					     "failed to register clock %s\n",
+					     name);
 	}
 
 	data = i2c_get_match_data(client);
@@ -1056,28 +1060,34 @@ static int vc3_probe(struct i2c_client *client)
 
 			pll_data->vco = data->pll2_vco;
 		}
+		name = clk_pll[i].hw.init->name;
 		ret = devm_clk_hw_register(dev, &clk_pll[i].hw);
 		if (ret)
-			return dev_err_probe(dev, ret, "%s failed\n",
-					     clk_pll[i].hw.init->name);
+			return dev_err_probe(dev, ret,
+					     "failed to register clock %s\n",
+					     name);
 	}
 
 	/* Register divider muxes */
 	for (i = 0; i < ARRAY_SIZE(clk_div_mux); i++) {
 		clk_div_mux[i].regmap = regmap;
+		name = clk_div_mux[i].hw.init->name;
 		ret = devm_clk_hw_register(dev, &clk_div_mux[i].hw);
 		if (ret)
-			return dev_err_probe(dev, ret, "%s failed\n",
-					     clk_div_mux[i].hw.init->name);
+			return dev_err_probe(dev, ret,
+					     "failed to register clock %s\n",
+					     name);
 	}
 
 	/* Register dividers */
 	for (i = 0; i < ARRAY_SIZE(clk_div); i++) {
 		clk_div[i].regmap = regmap;
+		name = clk_div[i].hw.init->name;
 		ret = devm_clk_hw_register(dev, &clk_div[i].hw);
 		if (ret)
-			return dev_err_probe(dev, ret, "%s failed\n",
-					     clk_div[i].hw.init->name);
+			return dev_err_probe(dev, ret,
+					     "failed to register clock %s\n",
+					     name);
 	}
 
 	/* Register clk muxes */
@@ -1088,10 +1098,12 @@ static int vc3_probe(struct i2c_client *client)
 
 			clk_data->bitmsk = data->se2_clk_sel_msk;
 		}
+		name = clk_mux[i].hw.init->name;
 		ret = devm_clk_hw_register(dev, &clk_mux[i].hw);
 		if (ret)
-			return dev_err_probe(dev, ret, "%s failed\n",
-					     clk_mux[i].hw.init->name);
+			return dev_err_probe(dev, ret,
+					     "failed to register clock %s\n",
+					     name);
 	}
 
 	/* Register clk outputs */
-- 
2.51.0