1 files changed, 4 insertions, 2 deletions

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 98618e397342..5708e951a5c6 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -1265,7 +1265,7 @@ static int kvm_hv_hypercall_complete_userspace(struct kvm_vcpu *vcpu)
         struct kvm_run *run = vcpu->run;
 
         kvm_hv_hypercall_set_result(vcpu, run->hyperv.u.hcall.result);
-        return 1;
+        return kvm_skip_emulated_instruction(vcpu);
 }
 
 static u16 kvm_hvcall_signal_event(struct kvm_vcpu *vcpu, bool fast, u64 param)
@@ -1296,8 +1296,10 @@ static u16 kvm_hvcall_signal_event(struct kvm_vcpu *vcpu, bool fast, u64 param)
         if (param & ~KVM_HYPERV_CONN_ID_MASK)
                 return HV_STATUS_INVALID_HYPERCALL_INPUT;
 
-        /* conn_to_evt is protected by vcpu->kvm->srcu */
+        /* the eventfd is protected by vcpu->kvm->srcu, but conn_to_evt isn't */
+        rcu_read_lock();
         eventfd = idr_find(&vcpu->kvm->arch.hyperv.conn_to_evt, param);
+        rcu_read_unlock();
         if (!eventfd)
                 return HV_STATUS_INVALID_PORT_ID;