Commit 3fc3a0be authored May 08, 2015 by Geert Uytterhoeven Committed by Rafael J. Wysocki May 19, 2015

PM / clk: Fix clock error check in __pm_clk_add()



In the final iteration of commit 245bd6f6 ("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: 245bd6f6 ("PM / clock_ops: Add pm_clk_add_clk()")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent d2c4b43d

drivers/base/power/clock_ops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}