diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-18 16:53:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 09:08:34 -0700 |
| commit | c44b175bf03cd74e517f3c98b2cb4896e04202ae (patch) | |
| tree | 8048de909b1cf9dd30fd720071d1dbed2447c85a /arch/x86 | |
| parent | 4e2fa4bbbac1c2e198e4c980d451c9ec568ae798 (diff) | |
| download | lwn-c44b175bf03cd74e517f3c98b2cb4896e04202ae.tar.gz lwn-c44b175bf03cd74e517f3c98b2cb4896e04202ae.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 0958fa2b7cb7..89d5e02b14ae 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -7340,6 +7340,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; } |