From: Ying Xue Date: Mon, 29 Oct 2012 13:38:15 +0000 (-0400) Subject: tipc: wake up all waiting threads at socket shutdown X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7503115107e5862870eaf5133627051b2e23ac0a;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git tipc: wake up all waiting threads at socket shutdown When a socket is shut down, we should wake up all thread sleeping on it, instead of just one of them. Otherwise, when several threads are polling the same socket, and one of them does shutdown(), the remaining threads may end up sleeping forever. Also, to align socket usage with common practice in other stacks, we use one of the common socket callback handlers, sk_state_change(), to wake up pending users. This is similar to the usage in e.g. inet_shutdown(). [net/ipv4/af_inet.c]. Signed-off-by: Ying Xue Signed-off-by: Jon Maloy Signed-off-by: Paul Gortmaker --- diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 59adc76905e..1a720c86e80 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1595,10 +1595,11 @@ restart: case SS_DISCONNECTING: - /* Discard any unreceived messages; wake up sleeping tasks */ + /* Discard any unreceived messages */ discard_rx_queue(sk); - if (waitqueue_active(sk_sleep(sk))) - wake_up_interruptible(sk_sleep(sk)); + + /* Wake up anyone sleeping in poll */ + sk->sk_state_change(sk); res = 0; break;