diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-18 18:53:29 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-05-01 01:06:03 +0300 |
| commit | 0b5b0458f13be9e30852dd302a322bd86ae7e1a5 (patch) | |
| tree | 84b27bc5a6433800a8825dc47b93930801cb79a3 /arch/x86 | |
| parent | 34a20235dd09ce6804b248ff8486fc394c13e750 (diff) | |
| download | linux-0b5b0458f13be9e30852dd302a322bd86ae7e1a5.tar.xz | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index e7cd4c833c40..e890c0398d62 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; } |