clk: Fix clk_core_get NULL dereference
authorBryan O'Donoghue <bryan.odonoghue@linaro.org>
Sat, 2 Mar 2024 00:52:14 +0000 (00:52 +0000)
committerStephen Boyd <sboyd@kernel.org>
Sat, 9 Mar 2024 00:36:19 +0000 (16:36 -0800)
It is possible for clk_core_get to dereference a NULL in the following
sequence:

clk_core_get()
    of_clk_get_hw_from_clkspec()
        __of_clk_get_hw_from_provider()
            __clk_get_hw()

__clk_get_hw() can return NULL which is dereferenced by clk_core_get() at
hw->core.

Prior to commit dde4eff47c82 ("clk: Look for parents with clkdev based
clk_lookups") the check IS_ERR_OR_NULL() was performed which would have
caught the NULL.

Reading the description of this function it talks about returning NULL but
that cannot be so at the moment.

Update the function to check for hw before dereferencing it and return NULL
if hw is NULL.

Fixes: dde4eff47c82 ("clk: Look for parents with clkdev based clk_lookups")
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20240302-linux-next-24-03-01-simple-clock-fixes-v1-1-25f348a5982b@linaro.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/clk.c

index 2253c154a824834f8e58e9074de6e31a4f548c83..20c4b28fed0616fe52dd533c21c91ca031266600 100644 (file)
@@ -418,6 +418,9 @@ static struct clk_core *clk_core_get(struct clk_core *core, u8 p_index)
        if (IS_ERR(hw))
                return ERR_CAST(hw);
 
+       if (!hw)
+               return NULL;
+
        return hw->core;
 }