Patch "clk: Fix clk_hw_get_clk() when dev is NULL" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    clk: Fix clk_hw_get_clk() when dev is NULL

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     clk-fix-clk_hw_get_clk-when-dev-is-null.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit cafd80dbb0a2833402fa61a6f67dd8b771e5e6f6
Author: Maxime Ripard <maxime@xxxxxxxxxx>
Date:   Fri Feb 25 15:35:23 2022 +0100

    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@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20220225143534.405820-2-maxime@xxxxxxxxxx
    Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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);