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: v4.1.12-92~150^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d2df9658605a0bc921adc0078a3813b31b443281;p=users%2Fjedix%2Flinux-maple.git

KVM: VMX: avoid guest hang on invalid invept instruction

Orabug: 23331149

[ Upstream commit 2849eb4f99d54925c543db12917127f88b3c38ff ]

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

Cc: stable@vger.kernel.org
Fixes: bfd0a56b90005f8c8a004baf407ad90045c2b11e
Reviewed-by: David Matlack <dmatlack@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 7a33539146bdcbbce25dbe93e853f39058c640a9)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index f66d6adec6ad..2790ecbfa376 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7206,6 +7206,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;
 	}