From: Maxime Ripard <maxime@cerno.tech>
To: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Phil Elwell <phil@raspberrypi.com>,
Tim Gover <tim.gover@raspberrypi.com>,
Dom Cobley <dom@raspberrypi.com>,
dri-devel@lists.freedesktop.org,
Maxime Ripard <maxime@cerno.tech>
Subject: [PATCH v6 01/12] clk: Fix clk_hw_get_clk() when dev is NULL
Date: Wed, 23 Feb 2022 11:55:49 +0100 [thread overview]
Message-ID: <20220223105600.1132593-2-maxime@cerno.tech> (raw)
In-Reply-To: <20220223105600.1132593-1-maxime@cerno.tech>
Any registered clk_core structure can have a NULL pointer in its dev
field. While never actually documented, this is evidenced by the wide
usage of clk_register and clk_hw_register with a NULL device pointer,
and the fact that the core of_clk_hw_register() function also passes a
NULL device pointer.
A call to clk_hw_get_clk() on a clk_hw struct whose clk_core is in that
case will result in a NULL pointer derefence when it calls dev_name() on
that NULL device pointer.
Add a test for this case and use NULL as the dev_id if the device
pointer is NULL.
Fixes: 30d6f8c15d2c ("clk: add api to get clk consumer from clk_hw")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/clk/clk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 8de6a22498e7..fff5edb89d6d 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -3773,8 +3773,9 @@ struct clk *clk_hw_create_clk(struct device *dev, struct clk_hw *hw,
struct clk *clk_hw_get_clk(struct clk_hw *hw, const char *con_id)
{
struct device *dev = hw->core->dev;
+ const char *name = dev ? dev_name(dev) : NULL;
- return clk_hw_create_clk(dev, hw, dev_name(dev), con_id);
+ return clk_hw_create_clk(dev, hw, name, con_id);
}
EXPORT_SYMBOL(clk_hw_get_clk);
--
2.35.1
next prev parent reply other threads:[~2022-02-23 10:56 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-23 10:55 [PATCH v6 00/12] clk: Improve clock range handling Maxime Ripard
2022-02-23 10:55 ` Maxime Ripard [this message]
2022-02-23 10:55 ` [PATCH v6 02/12] clk: Introduce Kunit Tests for the framework Maxime Ripard
2022-02-23 22:50 ` Daniel Latypov
2022-02-24 22:54 ` Stephen Boyd
2022-02-24 23:21 ` Daniel Latypov
2022-03-25 21:19 ` Stephen Boyd
2022-03-25 22:44 ` Daniel Latypov
2022-02-25 14:26 ` Maxime Ripard
2022-02-25 22:44 ` Stephen Boyd
2022-02-28 11:10 ` Maxime Ripard
2022-02-25 13:22 ` Maxime Ripard
2022-02-25 21:29 ` Daniel Latypov
2022-02-28 10:47 ` Maxime Ripard
2022-03-25 22:36 ` Daniel Latypov
2022-03-28 7:57 ` Maxime Ripard
2022-03-28 19:36 ` Daniel Latypov
2022-03-30 7:43 ` Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 03/12] clk: Enforce that disjoints limits are invalid Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 04/12] clk: Always clamp the rounded rate Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 05/12] clk: Use clamp instead of open-coding our own Maxime Ripard
2022-02-24 22:51 ` Stephen Boyd
2022-02-23 10:55 ` [PATCH v6 06/12] clk: Always set the rate on clk_set_range_rate Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 07/12] clk: Add clk_drop_range Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 08/12] clk: bcm: rpi: Add variant structure Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 09/12] clk: bcm: rpi: Set a default minimum rate Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 10/12] clk: bcm: rpi: Run some clocks at the minimum rate allowed Maxime Ripard
2022-02-23 10:55 ` [PATCH v6 11/12] drm/vc4: Add logging and comments Maxime Ripard
2022-02-23 10:56 ` [PATCH v6 12/12] drm/vc4: hdmi: Remove clock rate initialization Maxime Ripard
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=20220223105600.1132593-2-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=dave.stevenson@raspberrypi.com \
--cc=dom@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-clk@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=phil@raspberrypi.com \
--cc=sboyd@kernel.org \
--cc=tim.gover@raspberrypi.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