From: Parthasarathy B. <par...@er...> - 2017-03-13 17:58:20
|
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 SMB safe wq_has_sleeper(). Signed-off-by: Parthasarathy Bhuvaragan <par...@er...> --- net/tipc/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 79e628cd08a9..ce6ed0955e36 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1577,7 +1577,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))) + if (wq_has_sleeper(rcu_dereference(sk->sk_wq))) wake_up_interruptible(sk_sleep(sk)); /* 'ACK-' message is neither accepted nor rejected: */ -- 2.1.4 |