From bd48fccdb598b1351be9afa90603d933404a6b77 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 31 Jan 2018 15:37:58 +0000 Subject: [PATCH 009/104] Revert "x86/svm: Add code to clear registers on VM exit" CVE-2017-5753 (revert embargoed) CVE-2017-5715 (revert embargoed) This reverts commit 95177e2c17c2cba93d431e18c7c563cc00b303e6. Signed-off-by: Andy Whitcroft --- arch/x86/kvm/svm.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 39b517d3c9c2..487c159cc0db 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4946,22 +4946,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) "mov %%r13, %c[r13](%[svm]) \n\t" "mov %%r14, %c[r14](%[svm]) \n\t" "mov %%r15, %c[r15](%[svm]) \n\t" -#endif - /* Clear host registers (marked as clobbered so it's safe) */ - "xor %%" _ASM_BX ", %%" _ASM_BX " \n\t" - "xor %%" _ASM_CX ", %%" _ASM_CX " \n\t" - "xor %%" _ASM_DX ", %%" _ASM_DX " \n\t" - "xor %%" _ASM_SI ", %%" _ASM_SI " \n\t" - "xor %%" _ASM_DI ", %%" _ASM_DI " \n\t" -#ifdef CONFIG_X86_64 - "xor %%r8, %%r8 \n\t" - "xor %%r9, %%r9 \n\t" - "xor %%r10, %%r10 \n\t" - "xor %%r11, %%r11 \n\t" - "xor %%r12, %%r12 \n\t" - "xor %%r13, %%r13 \n\t" - "xor %%r14, %%r14 \n\t" - "xor %%r15, %%r15 \n\t" #endif "pop %%" _ASM_BP : -- 2.15.1