0072-x86-fpu-Remove-the-explicit-clearing-of-XSAVE-depend.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Andi Kleen <[email protected]>
  3. Date: Fri, 13 Oct 2017 14:56:45 -0700
  4. Subject: [PATCH] x86/fpu: Remove the explicit clearing of XSAVE dependent
  5. features
  6. MIME-Version: 1.0
  7. Content-Type: text/plain; charset=UTF-8
  8. Content-Transfer-Encoding: 8bit
  9. CVE-2017-5754
  10. Clearing a CPU feature with setup_clear_cpu_cap() clears all features
  11. which depend on it. Expressing feature dependencies in one place is
  12. easier to maintain than keeping functions like
  13. fpu__xstate_clear_all_cpu_caps() up to date.
  14. The features which depend on XSAVE have their dependency expressed in the
  15. dependency table, so its sufficient to clear X86_FEATURE_XSAVE.
  16. Remove the explicit clearing of XSAVE dependent features.
  17. Signed-off-by: Andi Kleen <[email protected]>
  18. Reviewed-by: Thomas Gleixner <[email protected]>
  19. Cc: Linus Torvalds <[email protected]>
  20. Cc: Peter Zijlstra <[email protected]>
  21. Link: http://lkml.kernel.org/r/[email protected]
  22. Signed-off-by: Ingo Molnar <[email protected]>
  23. (cherry picked from commit 73e3a7d2a7c3be29a5a22b85026f6cfa5664267f)
  24. Signed-off-by: Andy Whitcroft <[email protected]>
  25. Signed-off-by: Kleber Sacilotto de Souza <[email protected]>
  26. (cherry picked from commit af445f9ba8bb30b47ccb5247b8f5ba28c9f2be3e)
  27. Signed-off-by: Fabian Grünbichler <[email protected]>
  28. ---
  29. arch/x86/kernel/fpu/xstate.c | 20 --------------------
  30. 1 file changed, 20 deletions(-)
  31. diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
  32. index 3abe85b08234..fd6882c42246 100644
  33. --- a/arch/x86/kernel/fpu/xstate.c
  34. +++ b/arch/x86/kernel/fpu/xstate.c
  35. @@ -73,26 +73,6 @@ unsigned int fpu_user_xstate_size;
  36. void fpu__xstate_clear_all_cpu_caps(void)
  37. {
  38. setup_clear_cpu_cap(X86_FEATURE_XSAVE);
  39. - setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);
  40. - setup_clear_cpu_cap(X86_FEATURE_XSAVEC);
  41. - setup_clear_cpu_cap(X86_FEATURE_XSAVES);
  42. - setup_clear_cpu_cap(X86_FEATURE_AVX);
  43. - setup_clear_cpu_cap(X86_FEATURE_AVX2);
  44. - setup_clear_cpu_cap(X86_FEATURE_AVX512F);
  45. - setup_clear_cpu_cap(X86_FEATURE_AVX512IFMA);
  46. - setup_clear_cpu_cap(X86_FEATURE_AVX512PF);
  47. - setup_clear_cpu_cap(X86_FEATURE_AVX512ER);
  48. - setup_clear_cpu_cap(X86_FEATURE_AVX512CD);
  49. - setup_clear_cpu_cap(X86_FEATURE_AVX512DQ);
  50. - setup_clear_cpu_cap(X86_FEATURE_AVX512BW);
  51. - setup_clear_cpu_cap(X86_FEATURE_AVX512VL);
  52. - setup_clear_cpu_cap(X86_FEATURE_MPX);
  53. - setup_clear_cpu_cap(X86_FEATURE_XGETBV1);
  54. - setup_clear_cpu_cap(X86_FEATURE_AVX512VBMI);
  55. - setup_clear_cpu_cap(X86_FEATURE_PKU);
  56. - setup_clear_cpu_cap(X86_FEATURE_AVX512_4VNNIW);
  57. - setup_clear_cpu_cap(X86_FEATURE_AVX512_4FMAPS);
  58. - setup_clear_cpu_cap(X86_FEATURE_AVX512_VPOPCNTDQ);
  59. }
  60. /*
  61. --
  62. 2.14.2