From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 8 Jul 2010 08:44:46 +0000 (+0100)
Subject: x86/cpufreq: check array index before use
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11833
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e6e5b8fba0a2747c3d15f96c314d6111d00f4174;p=xen.git

x86/cpufreq: check array index before use

... rather than after.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c
index a9b1d239a2..d9697ddf32 100644
--- a/xen/arch/x86/acpi/cpufreq/cpufreq.c
+++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c
@@ -210,9 +210,11 @@ static u32 get_cur_val(cpumask_t mask)
 
     if (!cpu_isset(cpu, mask))
         cpu = first_cpu(mask);
-    policy = cpufreq_cpu_policy[cpu];
+    if (cpu >= NR_CPUS)
+        return 0;
 
-    if (cpu >= NR_CPUS || !policy || !drv_data[policy->cpu])
+    policy = cpufreq_cpu_policy[cpu];
+    if (!policy || !drv_data[policy->cpu])
         return 0;    
 
     switch (drv_data[policy->cpu]->cpu_feature) {