[PATCH 05/89] clk: Return error code when of provider pointer is NULL
From: Maxime Ripard <hidden>
Date: 2020-02-24 09:14:36
Also in:
dri-devel, linux-clk, lkml
Subsystem:
common clk framework, the rest · Maintainers:
Michael Turquette, Stephen Boyd, Linus Torvalds
The clock framework DT provider helpers don't check the pointers in the array registered by the clock provider before returning it. This means that if the array is sparse, we will end up returning a NULL pointer while the caller expects an error pointer, resulting in a crash. Let's test the pointer returned and properly return an error if the pointer is NULL. Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@kernel.org> Cc: linux-clk@vger.kernel.org Signed-off-by: Maxime Ripard <redacted> --- drivers/clk/clk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f0f2b599fd7e..8532b5ed1060 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c@@ -4318,13 +4318,18 @@ struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data) { struct clk_onecell_data *clk_data = data; unsigned int idx = clkspec->args[0]; + struct clk *clk; if (idx >= clk_data->clk_num) { pr_err("%s: invalid clock index %u\n", __func__, idx); return ERR_PTR(-EINVAL); } - return clk_data->clks[idx]; + clk = clk_data->clks[idx]; + if (!clk) + return ERR_PTR(-ENODEV); + + return clk; } EXPORT_SYMBOL_GPL(of_clk_src_onecell_get);
@@ -4333,13 +4338,18 @@ of_clk_hw_onecell_get(struct of_phandle_args *clkspec, void *data) { struct clk_hw_onecell_data *hw_data = data; unsigned int idx = clkspec->args[0]; + struct clk_hw *hw; if (idx >= hw_data->num) { pr_err("%s: invalid index %u\n", __func__, idx); return ERR_PTR(-EINVAL); } - return hw_data->hws[idx]; + hw = hw_data->hws[idx]; + if (!hw) + return ERR_PTR(-ENODEV); + + return hw; } EXPORT_SYMBOL_GPL(of_clk_hw_onecell_get);
--
git-series 0.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel