Commit e47c6a34 authored Jul 30, 2012 by Fengguang Wu Committed by Linus Torvalds Jul 30, 2012

clk: validate pointer in __clk_disable()



clk_get() returns -ENOENT on error and some careless caller might
dereference it without error checking:

In mxc_rnga_remove():

        struct clk *clk = clk_get(&pdev->dev, "rng");

	// ...

        clk_disable(clk);

Since it's insane to audit the lots of existing and future clk users,
let's add a check in the callee to avoid kernel panic and warn about
any buggy user.

Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Viresh Kumar <viresh.kumar@st.com>
Cc: viresh kumar <viresh.linux@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 7041717e

drivers/clk/clk.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -465,6 +465,9 @@ static void __clk_disable(struct clk *clk)
		if (!clk)
		return;

		if (WARN_ON(IS_ERR(clk)))
		return;

		if (WARN_ON(clk->enable_count == 0))
		return;

Admin message