| From | Jiri Slaby <> | Subject | [PATCH 3.12 37/98] KVM: VMX: avoid guest hang on invalid invept instruction | Date | Mon, 11 Apr 2016 15:22:39 +0200 |
| |
From: Paolo Bonzini <pbonzini@redhat.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
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: Jiri Slaby <jslaby@suse.cz> --- arch/x86/kvm/vmx.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 9e439266554d..92f9e2abf710 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6372,6 +6372,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; } -- 2.8.1
|