提交 2bc19dc3 编写于 作者: M Michael S. Tsirkin 提交者: Paolo Bonzini

kvm: x86: don't kill guest on unknown exit reason

KVM_EXIT_UNKNOWN is a kvm bug, we don't really know whether it was
triggered by a priveledged application.  Let's not kill the guest: WARN
and inject #UD instead.

Cc: stable@vger.kernel.org
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 a642fc30
...@@ -3551,9 +3551,9 @@ static int handle_exit(struct kvm_vcpu *vcpu) ...@@ -3551,9 +3551,9 @@ static int handle_exit(struct kvm_vcpu *vcpu)
if (exit_code >= ARRAY_SIZE(svm_exit_handlers) if (exit_code >= ARRAY_SIZE(svm_exit_handlers)
|| !svm_exit_handlers[exit_code]) { || !svm_exit_handlers[exit_code]) {
kvm_run->exit_reason = KVM_EXIT_UNKNOWN; WARN_ONCE(1, "vmx: unexpected exit reason 0x%x\n", exit_code);
kvm_run->hw.hardware_exit_reason = exit_code; kvm_queue_exception(vcpu, UD_VECTOR);
return 0; return 1;
} }
return svm_exit_handlers[exit_code](svm); return svm_exit_handlers[exit_code](svm);
......
...@@ -7174,10 +7174,10 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) ...@@ -7174,10 +7174,10 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
&& kvm_vmx_exit_handlers[exit_reason]) && kvm_vmx_exit_handlers[exit_reason])
return kvm_vmx_exit_handlers[exit_reason](vcpu); return kvm_vmx_exit_handlers[exit_reason](vcpu);
else { else {
vcpu->run->exit_reason = KVM_EXIT_UNKNOWN; WARN_ONCE(1, "vmx: unexpected exit reason 0x%x\n", exit_reason);
vcpu->run->hw.hardware_exit_reason = exit_reason; kvm_queue_exception(vcpu, UD_VECTOR);
return 1;
} }
return 0;
} }
static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr) static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册