summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2015-05-08 10:47:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-19 15:13:19 +0200
commit3fc3a0be0dab352e065d1dad7d3f81953ed0d4bc (patch)
tree7f48755fd8c37ea85da76eb1e7c5403436eea3d4 /drivers/base
parentdrivers: sh: remove boilerplate code and use USE_PM_CLK_RUNTIME_OPS (diff)
downloadlinux-3fc3a0be0dab352e065d1dad7d3f81953ed0d4bc.tar.xz
linux-3fc3a0be0dab352e065d1dad7d3f81953ed0d4bc.zip
PM / clk: Fix clock error check in __pm_clk_add()
In the final iteration of commit 245bd6f6af8a62a2 ("PM / clock_ops: Add pm_clk_add_clk()"), a refcount increment was added by Grygorii Strashko. However, the accompanying IS_ERR() check operates on the wrong clock pointer, which is always zero at this point, i.e. not an error. This may lead to a NULL pointer dereference later, when __clk_get() tries to dereference an error pointer. Check the passed clock pointer instead to fix this. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Fixes: 245bd6f6af8a62a2 ("PM / clock_ops: Add pm_clk_add_clk()") Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/clock_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 8abea669c82c..442ce010559b 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -94,7 +94,7 @@ static int __pm_clk_add(struct device *dev, const char *con_id,
return -ENOMEM;
}
} else {
- if (IS_ERR(ce->clk) || !__clk_get(clk)) {
+ if (IS_ERR(clk) || !__clk_get(clk)) {
kfree(ce);
return -ENOENT;
}