5.10-stable patches

added patches:
	arm64-topology-fix-possible-overflow-in-amu_fie_setup.patch

diff --git a/queue-5.10/arm64-topology-fix-possible-overflow-in-amu_fie_setup.patch b/queue-5.10/arm64-topology-fix-possible-overflow-in-amu_fie_setup.patch
new file mode 100644 (file)
index 0000000..4b69437
--- /dev/null
+++ b/queue-5.10/arm64-topology-fix-possible-overflow-in-amu_fie_setup.patch
@@ -0,0 +1,37 @@
+From d4955c0ad77dbc684fc716387070ac24801b8bca Mon Sep 17 00:00:00 2001
+From: Sergey Shtylyov <s.shtylyov@omp.ru>
+Date: Fri, 16 Sep 2022 23:17:07 +0300
+Subject: arm64: topology: fix possible overflow in amu_fie_setup()
+
+From: Sergey Shtylyov <s.shtylyov@omp.ru>
+
+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 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/kernel/topology.c
++++ b/arch/arm64/kernel/topology.c
+@@ -158,7 +158,7 @@ static int validate_cpu_freq_invariance_
+       }
+ 
+       /* Convert maximum frequency from KHz to Hz and validate */
+-      max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000;
++      max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000ULL;
+       if (unlikely(!max_freq_hz)) {
+               pr_debug("CPU%d: invalid maximum frequency.\n", cpu);
+               return -EINVAL;

diff --git a/queue-5.10/series b/queue-5.10/series
index 1503315c3576e7be1f515bda192cbbd3f2e07ce4..b1cb08e75467fcf7ec9116564c0f4c69c6669941 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -456,3 +456,4 @@ usb-idmouse-fix-an-uninit-value-in-idmouse_open.patch
 fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
 clk-bcm2835-make-peripheral-pllc-critical.patch
 perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch
+arm64-topology-fix-possible-overflow-in-amu_fie_setup.patch