0295-x86-svm-Add-code-to-clobber-the-RSB-on-VM-exit.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Tom Lendacky <[email protected]>
  3. Date: Wed, 20 Dec 2017 10:55:47 +0000
  4. Subject: [PATCH] x86/svm: Add code to clobber the RSB on VM exit
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. CVE-2017-5753
  9. CVE-2017-5715
  10. Add code to overwrite the local CPU RSB entries from the previous less
  11. privileged mode.
  12. Signed-off-by: Tom Lendacky <[email protected]>
  13. Signed-off-by: Andy Whitcroft <[email protected]>
  14. Signed-off-by: Kleber Sacilotto de Souza <[email protected]>
  15. (cherry picked from commit 9392e24469b71ff665cdbc3d81db215f9383219d)
  16. Signed-off-by: Fabian Grünbichler <[email protected]>
  17. ---
  18. arch/x86/kvm/svm.c | 2 ++
  19. 1 file changed, 2 insertions(+)
  20. diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
  21. index fade4869856a..e99bdfcc6b01 100644
  22. --- a/arch/x86/kvm/svm.c
  23. +++ b/arch/x86/kvm/svm.c
  24. @@ -5008,6 +5008,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
  25. wrmsrl(MSR_IA32_SPEC_CTRL, FEATURE_ENABLE_IBRS);
  26. }
  27. + stuff_RSB();
  28. +
  29. #ifdef CONFIG_X86_64
  30. wrmsrl(MSR_GS_BASE, svm->host.gs_base);
  31. #else
  32. --
  33. 2.14.2