Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 851946a6 authored by Hoang Le's avatar Hoang Le Committed by Greg Kroah-Hartman
Browse files

tipc: fix sleeping in tipc accept routine 



[ Upstream commit d237a7f11719ff9320721be5818352e48071aab6 ]

The release_sock() is blocking function, it would change the state
after sleeping. In order to evaluate the stated condition outside
the socket lock context, switch to use wait_woken() instead.

Fixes: 6398e23c ("tipc: standardize accept routine")
Acked-by: default avatarJon Maloy <jmaloy@redhat.com>
Signed-off-by: default avatarHoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 194b71d2

net/tipc/socket.c

+4 −5
Original line number Diff line number Diff line
@@ -2501,7 +2501,7 @@ static int tipc_listen(struct socket *sock, int len) 
static int tipc_wait_for_accept(struct socket *sock, long timeo)

{

	struct sock *sk = sock->sk;

	DEFINE_WAIT(wait);

	DEFINE_WAIT_FUNC(wait, woken_wake_function);

	int err;



	/* True wake-one mechanism for incoming connections: only
@@ -2510,12 +2510,12 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo) 
	 * anymore, the common case will execute the loop only once.

	*/

	for (;;) {

		prepare_to_wait_exclusive(sk_sleep(sk), &wait,

					  TASK_INTERRUPTIBLE);

		if (timeo && skb_queue_empty(&sk->sk_receive_queue)) {

			add_wait_queue(sk_sleep(sk), &wait);

			release_sock(sk);

			timeo = schedule_timeout(timeo);

			timeo = wait_woken(&wait, TASK_INTERRUPTIBLE, timeo);

			lock_sock(sk);

			remove_wait_queue(sk_sleep(sk), &wait);

		}

		err = 0;

		if (!skb_queue_empty(&sk->sk_receive_queue))
@@ -2527,7 +2527,6 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo) 
		if (signal_pending(current))

			break;

	}

	finish_wait(sk_sleep(sk), &wait);

	return err;

}