From: Brian Norris computersforpeace@gmail.com
commit 0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d upstream.
We might make bad memory allocations if we get (e.g.) -ENOSYS from of_clk_get_parent_count().
Noticed by Coverity.
Fixes: f66541ba02d5 ("clk: gpio: Get parent clk names in of_gpio_clk_setup()") Signed-off-by: Brian Norris computersforpeace@gmail.com Cc: Jyri Sarha jsarha@ti.com Cc: Sergej Sawazki ce3a@gmx.de Cc: Stephen Boyd sboyd@codeaurora.org Signed-off-by: Michael Turquette mturquette@baylibre.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
--- drivers/clk/clk-gpio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/clk/clk-gpio.c +++ b/drivers/clk/clk-gpio.c @@ -287,12 +287,14 @@ static void __init of_gpio_clk_setup(str const char **parent_names; int i, num_parents;
+ num_parents = of_clk_get_parent_count(node); + if (num_parents < 0) + return; + data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) return;
- num_parents = of_clk_get_parent_count(node); - parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL); if (!parent_names) return;