diff options
| author | Daniel Thompson <daniel.thompson@linaro.org> | 2015-06-28 10:55:32 +0100 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-02 09:51:26 -0700 |
| commit | 15ab38273d21a45487116ad4c428593427954848 (patch) | |
| tree | 2a96fa167916c61250de1400736a7e3523f7226b /drivers/clk | |
| parent | 69916d96094e1e16567c5f25515a13ed2896c730 (diff) | |
| download | linux-stable-15ab38273d21a45487116ad4c428593427954848.tar.gz linux-stable-15ab38273d21a45487116ad4c428593427954848.tar.bz2 linux-stable-15ab38273d21a45487116ad4c428593427954848.zip | |
clk: stm32: Fix out-by-one error path in the index lookup
If stm32f4_rcc_lookup() is called with primary == 0 and secondary == 192
then it will read beyond the end of the table array due to an out-by-one
error in the range check.
In addition to the fixing the inequality we also modify the r.h.s. to
make it even more explicit that we are comparing against the size of
table in bits.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Acked-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Fixes: 358bdf892f6b ("clk: stm32: Add clock driver for STM32F4[23]xxx devices")
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk-stm32f4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c index b9b12a742970..3f6f7ad39490 100644 --- a/drivers/clk/clk-stm32f4.c +++ b/drivers/clk/clk-stm32f4.c @@ -268,7 +268,7 @@ static int stm32f4_rcc_lookup_clk_idx(u8 primary, u8 secondary) memcpy(table, stm32f42xx_gate_map, sizeof(table)); /* only bits set in table can be used as indices */ - if (WARN_ON(secondary > 8 * sizeof(table) || + if (WARN_ON(secondary >= BITS_PER_BYTE * sizeof(table) || 0 == (table[BIT_ULL_WORD(secondary)] & BIT_ULL_MASK(secondary)))) return -EINVAL; |