KVM: hyperv: idr_find needs RCU protection
authorPaolo Bonzini <[email protected]>
Mon, 7 May 2018 17:24:34 +0000 (19:24 +0200)
committerPaolo Bonzini <[email protected]>
Fri, 11 May 2018 09:21:11 +0000 (11:21 +0200)
Even though the eventfd is released after the KVM SRCU grace period
elapses, the conn_to_evt data structure itself is not; it uses RCU
internally, instead.  Fix the read-side critical section to happen
under rcu_read_lock/unlock; the result is still protected by
vcpu->kvm->srcu.

Reviewed-by: Roman Kagan <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
arch/x86/kvm/hyperv.c

index 14dd5e5010a2db38f5415356e66c6261cd6164e4..5708e951a5c69664895a7b9a21ffe3c1bdc669bb 100644 (file)
@@ -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;