From nobody Thu Apr 9 15:00:58 2026 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7E936423162; Mon, 2 Mar 2026 16:54:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772470499; cv=none; b=FdWdudQszlpudo1G27nFMIZ+jvWPONLkYpCbQhAUadq3Awau72Xba4F8frlt1tfS40OheoNEylrMIu8Anggu54v1oQH9E7Qnw7yeEvz/1kGqHtgdcWfbgHEzDdDNl/mNE+GmnKeR4Egxyu9qf1IrZH7yIZn9q+b0VwOgyy9qVQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772470499; c=relaxed/simple; bh=HgzAEfE5xQSuGnub8+UaQIU2hl4Lqcxc39DHnPC3G7A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ch4JkcrovyEWO5GoRy4pzUDWzrM7+oNJS1mBCcjmPgLZhtiCN9dwwUirRl3ATZlMvWTJpcZaPV3px98mJtl01M/nFRQABX6/KHsL0l+5EUSmNEtcsIBA4ZRq0uAUOZnzI9Q3SYWnSoUQLkVbUV9bPjDwHkzvWoeWvAoEia+LYrA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com X-CSE-ConnectionGUID: 88d5BPg/QPeT9oo4i1aUIg== X-CSE-MsgGUID: xjpS3NZMT+608qhPm8qjWg== Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 03 Mar 2026 01:54:52 +0900 Received: from vm01.adwin.renesas.com (unknown [10.226.92.15]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 07BA1401A65F; Tue, 3 Mar 2026 01:54:47 +0900 (JST) From: Ovidiu Panait To: geert+renesas@glider.be, magnus.damm@gmail.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, biju.das.jz@bp.renesas.com, fabrizio.castro.jz@renesas.com Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH v4 1/7] clk: versaclock3: Fix NULL pointer dereference in error path Date: Mon, 2 Mar 2026 16:54:35 +0000 Message-ID: <20260302165441.4457-2-ovidiu.panait.rb@renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260302165441.4457-1-ovidiu.panait.rb@renesas.com> References: <20260302165441.4457-1-ovidiu.panait.rb@renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- v4 changes: None. 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 =3D 0; i < ARRAY_SIZE(clk_pfd_mux); i++) { clk_pfd_mux[i].regmap =3D regmap; + name =3D clk_pfd_mux[i].hw.init->name; ret =3D 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); } =20 /* Register pfd's */ for (i =3D 0; i < ARRAY_SIZE(clk_pfd); i++) { clk_pfd[i].regmap =3D regmap; + name =3D clk_pfd[i].hw.init->name; ret =3D 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); } =20 data =3D i2c_get_match_data(client); @@ -1056,28 +1060,34 @@ static int vc3_probe(struct i2c_client *client) =20 pll_data->vco =3D data->pll2_vco; } + name =3D clk_pll[i].hw.init->name; ret =3D 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); } =20 /* Register divider muxes */ for (i =3D 0; i < ARRAY_SIZE(clk_div_mux); i++) { clk_div_mux[i].regmap =3D regmap; + name =3D clk_div_mux[i].hw.init->name; ret =3D 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); } =20 /* Register dividers */ for (i =3D 0; i < ARRAY_SIZE(clk_div); i++) { clk_div[i].regmap =3D regmap; + name =3D clk_div[i].hw.init->name; ret =3D 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); } =20 /* Register clk muxes */ @@ -1088,10 +1098,12 @@ static int vc3_probe(struct i2c_client *client) =20 clk_data->bitmsk =3D data->se2_clk_sel_msk; } + name =3D clk_mux[i].hw.init->name; ret =3D 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); } =20 /* Register clk outputs */ --=20 2.51.0