]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
PM / clk: Fix clock error check in __pm_clk_add()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 8 May 2015 08:47:43 +0000 (10:47 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 May 2015 13:13:19 +0000 (15:13 +0200)
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>
drivers/base/power/clock_ops.c

index 8abea669c82c2192e3b3f9d715faf0c02c7edf98..442ce010559bf53197b72c9c52c57b85bfab680d 100644 (file)
@@ -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;
                }