From: William Theesfeld <william@theesfeld•net>
To: Michael Turquette <mturquette@baylibre•com>
Cc: Stephen Boyd <sboyd@kernel•org>,
Brian Masney <bmasney@redhat•com>,
Michal Simek <michal.simek@amd•com>,
linux-clk@vger•kernel.org, linux-arm-kernel@lists•infradead.org,
linux-kernel@vger•kernel.org
Subject: [PATCH] clk: zynq: handle kasprintf() failure in periph_clk registration
Date: Mon, 1 Jun 2026 16:35:00 -0400 [thread overview]
Message-ID: <20260601203500.658135-1-william@theesfeld.net> (raw)
zynq_clk_register_periph_clk() ignores the return value of the two
kasprintf() calls used to build the mux and divider clock names, and
passes the resulting (possibly NULL) pointers straight into
clk_register_mux(), clk_register_divider() and clk_register_gate() as
the clock '"'name'"' argument. On allocation failure that name later
gets dereferenced by the clock framework (e.g. in debugfs name
formatting), causing a NULL-pointer dereference.
Check both kasprintf() returns. On failure unwind any allocated name
buffer and the spinlock, then fall through to the existing err label
which sets clks[] to ERR_PTR(-ENOMEM). Freeing the spinlock on the
error path is correct here because no clk_register_*() call has had
a chance to take ownership of it; the success path intentionally
hands it off to the registered clocks.
The neighbouring zynq_clk_register_fclk() in the same file already
uses this per-allocation goto-label cleanup pattern; this change
brings periph_clk into line with it.
Signed-off-by: William Theesfeld <william@theesfeld•net>
---
drivers/clk/zynq/clkc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 6a22cbbc1..777187744 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -186,7 +186,11 @@ static void __init zynq_clk_register_periph_clk(enum zynq_clk clk0,
spin_lock_init(lock);
mux_name = kasprintf(GFP_KERNEL, "%s_mux", clk_name0);
+ if (!mux_name)
+ goto err_mux_name;
div_name = kasprintf(GFP_KERNEL, "%s_div", clk_name0);
+ if (!div_name)
+ goto err_div_name;
clk_register_mux(NULL, mux_name, parents, 4,
CLK_SET_RATE_NO_REPARENT, clk_ctrl, 4, 2, 0, lock);
@@ -205,6 +209,10 @@ static void __init zynq_clk_register_periph_clk(enum zynq_clk clk0,
return;
+err_div_name:
+ kfree(mux_name);
+err_mux_name:
+ kfree(lock);
err:
clks[clk0] = ERR_PTR(-ENOMEM);
if (two_gates)
--
2.54.0
next reply other threads:[~2026-06-01 20:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-01 20:35 William Theesfeld [this message]
2026-06-02 12:40 ` [PATCH] clk: zynq: handle kasprintf() failure in periph_clk registration Michal Simek
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=20260601203500.658135-1-william@theesfeld.net \
--to=william@theesfeld$(echo .)net \
--cc=bmasney@redhat$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-clk@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=michal.simek@amd$(echo .)com \
--cc=mturquette@baylibre$(echo .)com \
--cc=sboyd@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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