Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cb24e68 authored by Axel Lin's avatar Axel Lin Committed by Mike Turquette
Browse files

clk: mvebu: Fix valid value range checking for cpu_freq_select 



cpu_freq_select is used as array subscript, thus the valid value range
is 0 ... ARRAY_SIZE() - 1.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: fixed up trivial merge issues]
parent a68de8e4

drivers/clk/mvebu/clk-core.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static u32 __init armada_370_get_cpu_freq(void __iomem *sar) 


	cpu_freq_select = ((readl(sar) >> SARL_A370_PCLK_FREQ_OPT) &

			   SARL_A370_PCLK_FREQ_OPT_MASK);

	if (cpu_freq_select > ARRAY_SIZE(armada_370_cpu_frequencies)) {

	if (cpu_freq_select >= ARRAY_SIZE(armada_370_cpu_frequencies)) {

		pr_err("CPU freq select unsuported %d\n", cpu_freq_select);

		cpu_freq = 0;

	} else
@@ -278,7 +278,7 @@ static u32 __init armada_xp_get_cpu_freq(void __iomem *sar) 
	cpu_freq_select |= (((readl(sar+4) >> SARH_AXP_PCLK_FREQ_OPT) &

			     SARH_AXP_PCLK_FREQ_OPT_MASK)

			    << SARH_AXP_PCLK_FREQ_OPT_SHIFT);

	if (cpu_freq_select > ARRAY_SIZE(armada_xp_cpu_frequencies)) {

	if (cpu_freq_select >= ARRAY_SIZE(armada_xp_cpu_frequencies)) {

		pr_err("CPU freq select unsuported: %d\n", cpu_freq_select);

		cpu_freq = 0;

	} else