diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2012-06-08 14:04:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 08:58:59 -0700 |
| commit | 871d4f5e1d82cf0ad56ae076c8535004e7837416 (patch) | |
| tree | 0f4fb7a7b182ecbaddec1b81df7f3451072ced51 /drivers/clk | |
| parent | c5e42b8d692877676fc3ba9fdf3dbcbd723b4c2b (diff) | |
| download | linux-stable-871d4f5e1d82cf0ad56ae076c8535004e7837416.tar.gz linux-stable-871d4f5e1d82cf0ad56ae076c8535004e7837416.tar.bz2 linux-stable-871d4f5e1d82cf0ad56ae076c8535004e7837416.zip | |
clk: Check parent for NULL in clk_change_rate
commit bf47b4fd8f9f81cd5ce40e1945c6334d088226d1 upstream.
clk_change_rate() is accessing parent's rate without checking
if the parent exists at all. In case of root clocks this will
cause NULL pointer dereference.
This patch follows what clk_calc_new_rates() does in such
situation.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 2da025ee226d..7f1ea568b444 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -834,18 +834,21 @@ static void clk_change_rate(struct clk *clk) { struct clk *child; unsigned long old_rate; + unsigned long best_parent_rate = 0; struct hlist_node *tmp; old_rate = clk->rate; + if (clk->parent) + best_parent_rate = clk->parent->rate; + if (clk->ops->set_rate) clk->ops->set_rate(clk->hw, clk->new_rate); if (clk->ops->recalc_rate) - clk->rate = clk->ops->recalc_rate(clk->hw, - clk->parent->rate); + clk->rate = clk->ops->recalc_rate(clk->hw, best_parent_rate); else - clk->rate = clk->parent->rate; + clk->rate = best_parent_rate; if (clk->notifier_count && old_rate != clk->rate) __clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate); |