0240-x86-cpu-x86-pti-Do-not-enable-PTI-on-AMD-processors.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From 5462db3d070845ecc34929b6f25a87efda023aae Mon Sep 17 00:00:00 2001
  2. From: Tom Lendacky <[email protected]>
  3. Date: Tue, 26 Dec 2017 23:43:54 -0600
  4. Subject: [PATCH 240/241] x86/cpu, x86/pti: Do not enable PTI on AMD processors
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. CVE-2017-5754
  9. AMD processors are not subject to the types of attacks that the kernel
  10. page table isolation feature protects against. The AMD microarchitecture
  11. does not allow memory references, including speculative references, that
  12. access higher privileged data when running in a lesser privileged mode
  13. when that access would result in a page fault.
  14. Disable page table isolation by default on AMD processors by not setting
  15. the X86_BUG_CPU_INSECURE feature, which controls whether X86_FEATURE_PTI
  16. is set.
  17. Signed-off-by: Tom Lendacky <[email protected]>
  18. Signed-off-by: Thomas Gleixner <[email protected]>
  19. Reviewed-by: Borislav Petkov <[email protected]>
  20. Cc: Dave Hansen <[email protected]>
  21. Cc: Andy Lutomirski <[email protected]>
  22. Cc: [email protected]
  23. Link: https://lkml.kernel.org/r/[email protected]
  24. (cherry picked from commit 694d99d40972f12e59a3696effee8a376b79d7c8)
  25. Signed-off-by: Marcelo Henrique Cerri <[email protected]>
  26. (cherry picked from commit 9d334f48f017b9c6457c6ba321e5a53a1cc6a5c7)
  27. Signed-off-by: Fabian Grünbichler <[email protected]>
  28. ---
  29. arch/x86/kernel/cpu/common.c | 4 ++--
  30. 1 file changed, 2 insertions(+), 2 deletions(-)
  31. diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
  32. index 99f37d1636ff..1854dd8071a6 100644
  33. --- a/arch/x86/kernel/cpu/common.c
  34. +++ b/arch/x86/kernel/cpu/common.c
  35. @@ -899,8 +899,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
  36. setup_force_cpu_cap(X86_FEATURE_ALWAYS);
  37. - /* Assume for now that ALL x86 CPUs are insecure */
  38. - setup_force_cpu_bug(X86_BUG_CPU_INSECURE);
  39. + if (c->x86_vendor != X86_VENDOR_AMD)
  40. + setup_force_cpu_bug(X86_BUG_CPU_INSECURE);
  41. fpu__init_system(c);
  42. }
  43. --
  44. 2.14.2