From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 18 Mar 2016 15:53:29 +0000 (+0100)
Subject: KVM: VMX: avoid guest hang on invalid invept instruction
X-Git-Tag: v3.16.35~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b5b0458f13be9e30852dd302a322bd86ae7e1a5;p=thirdparty%2Fkernel%2Fstable.git

KVM: VMX: avoid guest hang on invalid invept instruction

commit 2849eb4f99d54925c543db12917127f88b3c38ff upstream.

A guest executing an invalid invept instruction would hang
because the instruction pointer was not updated.

Fixes: bfd0a56b90005f8c8a004baf407ad90045c2b11e
Reviewed-by: David Matlack <dmatlack@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index e7cd4c833c40a..e890c0398d62e 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6601,6 +6601,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)
 	if (!(types & (1UL << type))) {
 		nested_vmx_failValid(vcpu,
 				VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);
+		skip_emulated_instruction(vcpu);
 		return 1;
 	}