diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-02-25 17:35:23 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-08 15:23:48 +0300 |
| commit | 4be3e4c05d8dd1b83b75652cad88c9e752ec7054 (patch) | |
| tree | 58d04c1bee93e824c71c5038769f659e21d1e41f /drivers/clk | |
| parent | 071c958f8e1b5be8113e05cf600db3a4907680bb (diff) | |
| download | linux-4be3e4c05d8dd1b83b75652cad88c9e752ec7054.tar.xz | |
clk: Fix clk_hw_get_clk() when dev is NULL
[ Upstream commit 0c1b56df451716ba207bbf59f303473643eee4fd ]
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>
Link: https://lore.kernel.org/r/20220225143534.405820-2-maxime@cerno.tech
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index ac11cefc3191..32fd2853e8b2 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -3730,8 +3730,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); |