]> git.itanic.dy.fi Git - linux-stable/commitdiff
arm64: topology: fix possible overflow in amu_fie_setup()
authorSergey Shtylyov <s.shtylyov@omp.ru>
Fri, 16 Sep 2022 20:17:07 +0000 (23:17 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Sep 2022 09:11:45 +0000 (11:11 +0200)
commit d4955c0ad77dbc684fc716387070ac24801b8bca upstream.

cpufreq_get_hw_max_freq() returns max frequency in kHz as *unsigned int*,
while freq_inv_set_max_ratio() gets passed this frequency in Hz as 'u64'.
Multiplying max frequency by 1000 can potentially result in overflow --
multiplying by 1000ULL instead should avoid that...

Found by Linux Verification Center (linuxtesting.org) with the SVACE static
analysis tool.

Fixes: cd0ed03a8903 ("arm64: use activity monitors for frequency invariance")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/01493d64-2bce-d968-86dc-11a122a9c07d@omp.ru
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/kernel/topology.c

index acf67ef4c505d007c3ed41cff845ff0f22054909..d844b5317d2d9510874ad1e72111facf0659cca3 100644 (file)
@@ -249,7 +249,7 @@ static void amu_fie_setup(const struct cpumask *cpus)
        for_each_cpu(cpu, cpus) {
                if (!freq_counters_valid(cpu) ||
                    freq_inv_set_max_ratio(cpu,
-                                          cpufreq_get_hw_max_freq(cpu) * 1000,
+                                          cpufreq_get_hw_max_freq(cpu) * 1000ULL,
                                           arch_timer_get_rate()))
                        return;
        }