summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-07-29 13:17:06 +0300
committerLuis Henriques <luis.henriques@canonical.com>2015-09-30 13:20:38 +0100
commit043bf07c9200d84eb6581ca0b22a6c2d5ca9cf03 (patch)
treebfb9c922b82949e206b14bc61cdba3d531214697 /drivers/clk
parent5a03b287dad7e8564ab83876356dcea4d4e5e2c9 (diff)
downloadlinux-stable-043bf07c9200d84eb6581ca0b22a6c2d5ca9cf03.tar.gz
linux-stable-043bf07c9200d84eb6581ca0b22a6c2d5ca9cf03.tar.bz2
linux-stable-043bf07c9200d84eb6581ca0b22a6c2d5ca9cf03.zip
clk: versatile: off by one in clk_sp810_timerclken_of_get()
commit 3294bee87091be5f179474f6c39d1d87769635e2 upstream. The ">" should be ">=" or we end up reading beyond the end of the array. Fixes: 6e973d2c4385 ('clk: vexpress: Add separate SP810 driver') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/versatile/clk-sp810.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/versatile/clk-sp810.c b/drivers/clk/versatile/clk-sp810.c
index c6e86a9a2aa3..5122ef25f595 100644
--- a/drivers/clk/versatile/clk-sp810.c
+++ b/drivers/clk/versatile/clk-sp810.c
@@ -128,8 +128,8 @@ static struct clk *clk_sp810_timerclken_of_get(struct of_phandle_args *clkspec,
{
struct clk_sp810 *sp810 = data;
- if (WARN_ON(clkspec->args_count != 1 || clkspec->args[0] >
- ARRAY_SIZE(sp810->timerclken)))
+ if (WARN_ON(clkspec->args_count != 1 ||
+ clkspec->args[0] >= ARRAY_SIZE(sp810->timerclken)))
return NULL;
return sp810->timerclken[clkspec->args[0]].clk;