net: fix sleeping for sk_wait_event()

Similar to commit 14135f30e33c ("inet: fix sleeping inside inet_wait_for_connect()"),
sk_wait_event() needs to fix too, because release_sock() is blocking,
it changes the process state back to running after sleep, which breaks
the previous prepare_to_wait().

Switch to the new wait API.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 12 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 149396366e80..22d92f0ec5ac 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -876,9 +876,9 @@ exit:
 
 static int tipc_wait_for_sndmsg(struct socket *sock, long *timeo_p)
 {
+        DEFINE_WAIT_FUNC(wait, woken_wake_function);
         struct sock *sk = sock->sk;
         struct tipc_sock *tsk = tipc_sk(sk);
-        DEFINE_WAIT(wait);
         int done;
 
         do {
@@ -892,9 +892,9 @@ static int tipc_wait_for_sndmsg(struct socket *sock, long *timeo_p)
                 if (signal_pending(current))
                         return sock_intr_errno(*timeo_p);
 
-                prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
-                done = sk_wait_event(sk, timeo_p, !tsk->link_cong);
-                finish_wait(sk_sleep(sk), &wait);
+                add_wait_queue(sk_sleep(sk), &wait);
+                done = sk_wait_event(sk, timeo_p, !tsk->link_cong, &wait);
+                remove_wait_queue(sk_sleep(sk), &wait);
         } while (!done);
         return 0;
 }
@@ -1031,9 +1031,9 @@ new_mtu:
 
 static int tipc_wait_for_sndpkt(struct socket *sock, long *timeo_p)
 {
+        DEFINE_WAIT_FUNC(wait, woken_wake_function);
         struct sock *sk = sock->sk;
         struct tipc_sock *tsk = tipc_sk(sk);
-        DEFINE_WAIT(wait);
         int done;
 
         do {
@@ -1049,12 +1049,12 @@ static int tipc_wait_for_sndpkt(struct socket *sock, long *timeo_p)
                 if (signal_pending(current))
                         return sock_intr_errno(*timeo_p);
 
-                prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+                add_wait_queue(sk_sleep(sk), &wait);
                 done = sk_wait_event(sk, timeo_p,
                                      (!tsk->link_cong &&
                                       !tsk_conn_cong(tsk)) ||
-                                      !tipc_sk_connected(sk));
-                finish_wait(sk_sleep(sk), &wait);
+                                      !tipc_sk_connected(sk), &wait);
+                remove_wait_queue(sk_sleep(sk), &wait);
         } while (!done);
         return 0;
 }
@@ -1929,8 +1929,8 @@ xmit:
 
 static int tipc_wait_for_connect(struct socket *sock, long *timeo_p)
 {
+        DEFINE_WAIT_FUNC(wait, woken_wake_function);
         struct sock *sk = sock->sk;
-        DEFINE_WAIT(wait);
         int done;
 
         do {
@@ -1942,10 +1942,10 @@ static int tipc_wait_for_connect(struct socket *sock, long *timeo_p)
                 if (signal_pending(current))
                         return sock_intr_errno(*timeo_p);
 
-                prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+                add_wait_queue(sk_sleep(sk), &wait);
                 done = sk_wait_event(sk, timeo_p,
-                                     sk->sk_state != TIPC_CONNECTING);
-                finish_wait(sk_sleep(sk), &wait);
+                                     sk->sk_state != TIPC_CONNECTING, &wait);
+                remove_wait_queue(sk_sleep(sk), &wait);
         } while (!done);
         return 0;
 }