[SRU Trusty 1/2] UBUNTU: SAUCE: x86/cpuid: Fix ordering of scattered feature list

[Stefan Bader]

CVE-2017-5753
CVE-2017-5715

The list must be ordered by cpuid level, otherwise lookup will
not work.

Fixes: 8d4f329 ("x86/cpuid: Provide get_scattered_cpuid_leaf()")
Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 arch/x86/kernel/cpu/scattered.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index 7be2451..390483e 100644
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -33,8 +33,8 @@ static const struct cpuid_bit cpuid_bits[] = {
 	{ X86_FEATURE_PTS,		CR_EAX, 6, 0x00000006, 0 },
 	{ X86_FEATURE_APERFMPERF,	CR_ECX, 0, 0x00000006, 0 },
 	{ X86_FEATURE_EPB,		CR_ECX, 3, 0x00000006, 0 },
-	{ X86_FEATURE_XSAVEOPT,		CR_EAX,	0, 0x0000000d, 1 },
 	{ X86_FEATURE_SPEC_CTRL,	CR_EDX,26, 0x00000007, 0 },
+	{ X86_FEATURE_XSAVEOPT,		CR_EAX,	0, 0x0000000d, 1 },
 	{ X86_FEATURE_HW_PSTATE,	CR_EDX, 7, 0x80000007, 0 },
 	{ X86_FEATURE_CPB,		CR_EDX, 9, 0x80000007, 0 },
 	{ X86_FEATURE_PROC_FEEDBACK,	CR_EDX,11, 0x80000007, 0 },
-- 
2.7.4