diff options
| author | Liran Alon | 2017-11-05 15:56:33 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2017-11-17 13:20:11 +0100 |
| commit | 1f4dcb3b213235e642088709a1c54964d23365e9 (patch) | |
| tree | 444ea25f9205cf8e4c6bc63adb404346346a28dd /arch/x86/kvm/x86.c | |
| parent | KVM: x86: Exit to user-mode on #UD intercept when emulator requires (diff) | |
| download | kernel-qcow2-linux-1f4dcb3b213235e642088709a1c54964d23365e9.tar.gz kernel-qcow2-linux-1f4dcb3b213235e642088709a1c54964d23365e9.tar.xz kernel-qcow2-linux-1f4dcb3b213235e642088709a1c54964d23365e9.zip | |
KVM: x86: emulator: Return to user-mode on L1 CPL=0 emulation failure
On this case, handle_emulation_failure() fills kvm_run with
internal-error information which it expects to be delivered
to user-mode for further processing.
However, the code reports a wrong return-value which makes KVM to never
return to user-mode on this scenario.
Fixes: 6d77dbfc88e3 ("KVM: inject #UD if instruction emulation fails and exit to
userspace")
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Reviewed-by: Nikita Leshenko <nikita.leshchenko@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1d492b3660d5..e5a7c53a19c6 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5433,7 +5433,7 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu) vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR; vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION; vcpu->run->internal.ndata = 0; - r = EMULATE_FAIL; + r = EMULATE_USER_EXIT; } kvm_queue_exception(vcpu, UD_VECTOR); |