浏览代码

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: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Michael S. Tsirkin 11 年之前
父节点
当前提交
2bc19dc375
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 3 3
      arch/x86/kvm/svm.c
  2. 3 3
      arch/x86/kvm/vmx.c

+ 3 - 3
arch/x86/kvm/svm.c

@@ -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;
-		kvm_run->hw.hardware_exit_reason = exit_code;
-		return 0;
+		WARN_ONCE(1, "vmx: unexpected exit reason 0x%x\n", exit_code);
+		kvm_queue_exception(vcpu, UD_VECTOR);
+		return 1;
 	}
 	}
 
 
 	return svm_exit_handlers[exit_code](svm);
 	return svm_exit_handlers[exit_code](svm);

+ 3 - 3
arch/x86/kvm/vmx.c

@@ -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;
-		vcpu->run->hw.hardware_exit_reason = exit_reason;
+		WARN_ONCE(1, "vmx: unexpected exit reason 0x%x\n", 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)