diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 1bf7c09d97e61099f1e1be735db1ecee3acb6647..eb714f1cdf7eee4ca9036005c3ab72ef9228ae9b 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2204,6 +2204,8 @@ static int ud_interception(struct vcpu_svm *svm)
 
 	WARN_ON_ONCE(is_guest_mode(&svm->vcpu));
 	er = emulate_instruction(&svm->vcpu, EMULTYPE_TRAP_UD);
+	if (er == EMULATE_USER_EXIT)
+		return 0;
 	if (er != EMULATE_DONE)
 		kvm_queue_exception(&svm->vcpu, UD_VECTOR);
 	return 1;
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index d319e2666ad586252511e3329e6fcd4be703f9db..65f1f06f6aaa7f621377941ac6545473cae9723d 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -5919,6 +5919,8 @@ static int handle_exception(struct kvm_vcpu *vcpu)
 	if (is_invalid_opcode(intr_info)) {
 		WARN_ON_ONCE(is_guest_mode(vcpu));
 		er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD);
+		if (er == EMULATE_USER_EXIT)
+			return 0;
 		if (er != EMULATE_DONE)
 			kvm_queue_exception(vcpu, UD_VECTOR);
 		return 1;