summaryrefslogtreecommitdiffstats
path: root/drivers/clk/clk-gpio.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2015-12-16 10:35:03 -0800
committerMichael Turquette <mturquette@baylibre.com>2015-12-31 21:54:45 -0800
commit0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d (patch)
tree2c410f51420be70bb3f232af460f95c56708fadd /drivers/clk/clk-gpio.c
parentc76eb11c8f0bae27aa4db9a18031a497ba6e2636 (diff)
downloadlinux-0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d.tar.gz
linux-0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d.tar.bz2
linux-0b2e78865d92e2d70542cb1d4d7af1d4ea0a286d.zip
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.c6
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,
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) {
kfree(data);