From: Parthasarathy Bhuvaragan Date: Wed, 26 Apr 2017 08:05:00 +0000 (+0200) Subject: tipc: Fix missing connection request handling X-Git-Tag: MMI-PSA29.97-13-9~5767^2~7^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=42b531de17d2f6bb9293f23398f6d9bb94635c3e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git tipc: Fix missing connection request handling In filter_connect, we use waitqueue_active() to check for any connections to wakeup. But waitqueue_active() is missing memory barriers while accessing the critical sections, leading to inconsistent results. In this commit, we replace this with an SMP safe wq_has_sleeper() using the generic socket callback sk_data_ready(). Signed-off-by: Parthasarathy Bhuvaragan Reviewed-by: Jon Maloy Signed-off-by: David S. Miller --- diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 566906795c8c..3b8df510a80c 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1581,8 +1581,7 @@ static bool filter_connect(struct tipc_sock *tsk, struct sk_buff *skb) return true; /* If empty 'ACK-' message, wake up sleeping connect() */ - if (waitqueue_active(sk_sleep(sk))) - wake_up_interruptible(sk_sleep(sk)); + sk->sk_data_ready(sk); /* 'ACK-' message is neither accepted nor rejected: */ msg_set_dest_droppable(hdr, 1);