diff options
author | Brian Norris <computersforpeace@gmail.com> | 2015-12-16 13:35:03 -0500 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2016-01-01 00:54:45 -0500 |
commit | 0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d (patch) | |
tree | 2c410f51420be70bb3f232af460f95c56708fadd /drivers/clk/clk-gpio.c | |
parent | c76eb11c8f0bae27aa4db9a18031a497ba6e2636 (diff) |
clk: gpio: handle error codes for of_clk_get_parent_count()
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>
Diffstat (limited to 'drivers/clk/clk-gpio.c')
-rw-r--r-- | drivers/clk/clk-gpio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c index c1baa89cbf91..1767b9e3ca93 100644 --- a/drivers/clk/clk-gpio.c +++ b/drivers/clk/clk-gpio.c | |||
@@ -287,12 +287,14 @@ static void __init of_gpio_clk_setup(struct device_node *node, | |||
287 | const char **parent_names; | 287 | const char **parent_names; |
288 | int i, num_parents; | 288 | int i, num_parents; |
289 | 289 | ||
290 | num_parents = of_clk_get_parent_count(node); | ||
291 | if (num_parents < 0) | ||
292 | return; | ||
293 | |||
290 | data = kzalloc(sizeof(*data), GFP_KERNEL); | 294 | data = kzalloc(sizeof(*data), GFP_KERNEL); |
291 | if (!data) | 295 | if (!data) |
292 | return; | 296 | return; |
293 | 297 | ||
294 | num_parents = of_clk_get_parent_count(node); | ||
295 | |||
296 | parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL); | 298 | parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL); |
297 | if (!parent_names) { | 299 | if (!parent_names) { |
298 | kfree(data); | 300 | kfree(data); |