aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2017-12-19 03:33:29 -0500
committerMichael Turquette <mturquette@baylibre.com>2017-12-19 14:44:21 -0500
commit29fd2a34ef8d863e48183bd473ba57c8d7839e25 (patch)
treecabefb26c96b4a3298aab4bcb72cf94cebb068fc
parent4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (diff)
clk: check ops pointer on clock register
Nothing really prevents a provider from (trying to) register a clock without providing the clock ops structure. We do check the individual fields before using them, but not the structure pointer itself. This may have the usual nasty consequences when the pointer is dereferenced, most likely when checking one the field during the initialization. This is fixed by returning an error on clock register if the ops pointer is NULL. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Michael Turquette <mturquette@baylibre.com> Link: lkml.kernel.org/r/20171219083329.24746-1-jbrunet@baylibre.com
-rw-r--r--drivers/clk/clk.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 647d056df88c..e3e98acab2c0 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2678,7 +2678,13 @@ struct clk *clk_register(struct device *dev, struct clk_hw *hw)
2678 ret = -ENOMEM; 2678 ret = -ENOMEM;
2679 goto fail_name; 2679 goto fail_name;
2680 } 2680 }
2681
2682 if (WARN_ON(!hw->init->ops)) {
2683 ret = -EINVAL;
2684 goto fail_ops;
2685 }
2681 core->ops = hw->init->ops; 2686 core->ops = hw->init->ops;
2687
2682 if (dev && pm_runtime_enabled(dev)) 2688 if (dev && pm_runtime_enabled(dev))
2683 core->dev = dev; 2689 core->dev = dev;
2684 if (dev && dev->driver) 2690 if (dev && dev->driver)
@@ -2740,6 +2746,7 @@ fail_parent_names_copy:
2740 kfree_const(core->parent_names[i]); 2746 kfree_const(core->parent_names[i]);
2741 kfree(core->parent_names); 2747 kfree(core->parent_names);
2742fail_parent_names: 2748fail_parent_names:
2749fail_ops:
2743 kfree_const(core->name); 2750 kfree_const(core->name);
2744fail_name: 2751fail_name:
2745 kfree(core); 2752 kfree(core);