KVM: x86: nSVM: skip eax alignment check for non-SVM instructions
PATCH 1/1 KVM: x86: nSVM: skip eax alignment check for non-SVM instructions
The bug occurs on #GP triggered by VMware backdoor when eax value is unaligned. eax alignment check should not be applied to non-SVM instructions because it leads to incorrect omission of the instructions emulation.
Apply the alignment check only to SVM instructions to fix.
---
This bug breaks nyx-fuzz (https://nyx-fuzz.com) that uses VMware backdoor as an alternative way for hypercall from guest user-mode. With this bug a hypercall interpreted as a GP and leads to process termination.
arch/x86/kvm/svm/svm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/kvm/svm/svm.c +6 -5
@@ -2233,10 +2233,6 @@ static int gp_interception(struct kvm_vcpu *vcpu)if (error_code) goto reinject; -/* All SVM instructions expect page aligned RAX */ -if (svm->vmcb->save.rax & ~PAGE_MASK ) - goto reinject; -/* Decode the instruction for usage later */ if (x86_decode_emulated_instruction (vcpu,0 ,NULL ,0 ) !=EMULATION_OK ) goto reinject;
@@ -2254,8 +2250,13 @@ static int gp_interception(struct kvm_vcpu *vcpu)if (!is_guest_mode (vcpu))return kvm_emulate_instruction (vcpu,EMULTYPE_VMWARE_GP |EMULTYPE_NO_DECODE ); - }else + }else { +/* All SVM instructions expect page aligned RAX */ +if (svm->vmcb->save.rax & ~PAGE_MASK ) + goto reinject; +return emulate_svm_instr (vcpu, opcode); + } reinject:kvm_queue_exception_e (vcpu,GP_VECTOR , error_code);
Signature · 1 line
2.34.1
Quoted 37 lines · Denis Valeev
The bug occurs on #GP triggered by VMware backdoor when eax value is unaligned. eax alignment check should not be applied to non-SVM instructions because it leads to incorrect omission of the instructions emulation.
Apply the alignment check only to SVM instructions to fix.Fixes d1cba6c92237 ("KVM: x86: nSVM: test eax for 4K alignment for GP errata workaround")Signed-off-by Denis Valeev <[email protected]>---
This bug breaks nyx-fuzz (https://nyx-fuzz.com) that uses VMware backdoor as an alternative way for hypercall from guest user-mode. With this bug a hypercall interpreted as a GP and leads to process termination.arch/x86/kvm/svm/svm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)arch/x86/kvm/svm/svm.c +0
-5@@ -2233,10 +2233,6 @@ static int gp_interception(struct kvm_vcpu *vcpu)if (error_code) goto reinject; -/* All SVM instructions expect page aligned RAX */ -if (svm->vmcb->save.rax & ~PAGE_MASK ) - goto reinject; -/* Decode the instruction for usage later */ if (x86_decode_emulated_instruction (vcpu,0 ,NULL ,0 ) !=EMULATION_OK ) goto reinject;@@ -2254,8 +2250,13 @@ static int gp_interception(struct kvm_vcpu *vcpu)if (!is_guest_mode (vcpu))return kvm_emulate_instruction (vcpu,EMULTYPE_VMWARE_GP |EMULTYPE_NO_DECODE ); - }else
arch/x86/kvm/svm/svm.c static int gp_interception(struct kvm_vcpu *vcpu) · line 2262
Quoted 10 lines
arch/x86/kvm/svm/svm.c +6
-0+ }else { +/* All SVM instructions expect page aligned RAX */ +if (svm->vmcb->save.rax & ~PAGE_MASK ) + goto reinject; +return emulate_svm_instr (vcpu, opcode); + } reinject:kvm_queue_exception_e (vcpu,GP_VECTOR , error_code);
Oops.
Thanks,
Best regards,
Maxim Levitsky