From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Jacky Huang <ychuang3@nuvoton.com>,
Shan-Chun Hung <schung@nuvoton.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Richard Cochran <richardcochran@gmail.com>,
Arnd Bergmann <arnd@arndb.de>,
Brian Masney <bmasney+clk@redhat.com>,
Jerome Brunet <jbrunet+clk@baylibre.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Andrew Jeffery <andrew@codeconstruct.com.au>,
Avi Fishman <avifishman70@gmail.com>,
Tomer Maimon <tmaimon77@gmail.com>,
Tali Perry <tali.perry1@gmail.com>,
Patrick Venture <venture@google.com>,
Nancy Yuen <yuenn@google.com>,
Benjamin Fair <benjaminfair@google.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Steam Lin <STLin2@winbond.com>,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org,
Krzysztof Kozlowski <krzk@kernel.org>,
devicetree@vger.kernel.org, openbmc@lists.ozlabs.org,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH v12 03/10] clk: nuvoton: ma35d1: Avoid possible error pointer dereferencing
Date: Wed, 18 Nov 2026 17:59:12 +0100 [thread overview]
Message-ID: <20261118-perso-ma35d1-upstream-clk-v12-3-bee2c8dad4e1@bootlin.com> (raw)
In-Reply-To: <20261118-perso-ma35d1-upstream-clk-v12-0-bee2c8dad4e1@bootlin.com>
MA35D1 registration helpers store their parent_hw argument straight into
the parent data, without checking it first. In case of registration
failure an error pointer will be stored in the table, which is then
forwarded to the clk core, which treats any non-NULL parent as valid
handles.
Bail out early when the parent is an error pointer, instead of building
the parent data.
This issue is mostly theoretical in practice, since reaching such an
error would involve a very early -ENOMEM.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/clk/nuvoton/clk-ma35d1-divider.c | 3 +++
drivers/clk/nuvoton/clk-ma35d1-pll.c | 3 +++
drivers/clk/nuvoton/clk-ma35d1.c | 13 +++++++++++--
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/nuvoton/clk-ma35d1-divider.c b/drivers/clk/nuvoton/clk-ma35d1-divider.c
index b70f460c48d5..3210ec8a1bcf 100644
--- a/drivers/clk/nuvoton/clk-ma35d1-divider.c
+++ b/drivers/clk/nuvoton/clk-ma35d1-divider.c
@@ -90,6 +90,9 @@ struct clk_hw *ma35d1_reg_adc_clkdiv(struct device *dev, const char *name,
int ret;
int i;
+ if (IS_ERR(parent_hw))
+ return parent_hw;
+
div = devm_kzalloc_obj(dev, *div);
if (!div)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/nuvoton/clk-ma35d1-pll.c b/drivers/clk/nuvoton/clk-ma35d1-pll.c
index 8b7133284d46..79fe89d5b6f2 100644
--- a/drivers/clk/nuvoton/clk-ma35d1-pll.c
+++ b/drivers/clk/nuvoton/clk-ma35d1-pll.c
@@ -336,6 +336,9 @@ struct clk_hw *ma35d1_reg_clk_pll(struct device *dev, u32 id, u8 u8mode, const c
struct clk_hw *hw;
int ret;
+ if (IS_ERR(parent_hw))
+ return parent_hw;
+
pll = devm_kzalloc_obj(dev, *pll);
if (!pll)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/clk/nuvoton/clk-ma35d1.c b/drivers/clk/nuvoton/clk-ma35d1.c
index c65ceed2fd5e..ba12d4068e83 100644
--- a/drivers/clk/nuvoton/clk-ma35d1.c
+++ b/drivers/clk/nuvoton/clk-ma35d1.c
@@ -130,10 +130,19 @@ static struct clk_hw *ma35d1_clk_mux(struct device *dev, const char *name,
const int *parent_idx, int num_parents)
{
const struct clk_hw *parent_hws[MA35D1_MUX_MAX_PARENTS] = {};
+ struct clk_hw *parent;
int i;
- for (i = 0; i < num_parents; i++)
- parent_hws[i] = (parent_idx[i] >= 0) ? hws[parent_idx[i]] : NULL;
+ for (i = 0; i < num_parents; i++) {
+ if (parent_idx[i] < 0)
+ continue;
+
+ parent = hws[parent_idx[i]];
+ if (IS_ERR(parent))
+ return parent;
+
+ parent_hws[i] = parent;
+ }
return devm_clk_hw_register_mux_parent_hws(dev, name, parent_hws, num_parents,
CLK_SET_RATE_NO_REPARENT, reg, shift,
--
2.56.0
next prev parent reply other threads:[~2026-11-18 17:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 16:59 [PATCH v12 00/10] clk: nuvoton: ma35d1: Fix mux parenting and peripheral clock rates Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 01/10] dt-bindings: clock: ma35d1: Mark HXT and LXT legacy Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 02/10] clk: nuvoton: ma35d1: Use clk_hw pointers as mux parents Miquel Raynal
2026-11-18 16:59 ` Miquel Raynal [this message]
2026-11-18 16:59 ` [PATCH v12 04/10] clk: nuvoton: ma35d1: Retrieve HXT/LXT from DT when possible Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 05/10] clk: nuvoton: ma35d1: Reparent the gates correctly Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 06/10] clk: nuvoton: ma35d1: Use device managed helpers for fixed rate clocks Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 07/10] clk: Create devm_clk_hw_register_fixed_rate_parent_hw() Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 08/10] clk: nuvoton: ma35d1: Reparent SYSPLL correctly Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 09/10] clk: nuvoton: ma35d1: Fix CCAP muxes bus width Miquel Raynal
2026-11-18 16:59 ` [PATCH v12 10/10] MAINTAINERS: Add myself as Nuvoton MA35D1 clock controller Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118-perso-ma35d1-upstream-clk-v12-3-bee2c8dad4e1@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=STLin2@winbond.com \
--cc=andrew@codeconstruct.com.au \
--cc=arnd@arndb.de \
--cc=avifishman70@gmail.com \
--cc=benjaminfair@google.com \
--cc=bmasney+clk@redhat.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet+clk@baylibre.com \
--cc=krzk+dt@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=openbmc@lists.ozlabs.org \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=schung@nuvoton.com \
--cc=tali.perry1@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tmaimon77@gmail.com \
--cc=venture@google.com \
--cc=ychuang3@nuvoton.com \
--cc=yuenn@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®