Commit 517d7c79 authored Dec 28, 2017 by Parthasarathy Bhuvaragan Committed by David S. Miller Dec 28, 2017

tipc: fix hanging poll() for stream sockets



In commit 42b531de ("tipc: Fix missing connection request
handling"), we replaced unconditional wakeup() with condtional
wakeup for clients with flags POLLIN | POLLRDNORM | POLLRDBAND.

This breaks the applications which do a connect followed by poll
with POLLOUT flag. These applications are not woken when the
connection is ESTABLISHED and hence sleep forever.

In this commit, we fix it by including the POLLOUT event for
sockets in TIPC_CONNECTING state.

Fixes: 42b531de ("tipc: Fix missing connection request handling")
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1528f6e2

net/tipc/socket.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -727,11 +727,11 @@ static unsigned int tipc_poll(struct file file, struct socket sock,

		switch (sk->sk_state) {
		case TIPC_ESTABLISHED:
		case TIPC_CONNECTING:
		if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk))
		revents \|= POLLOUT;
		/* fall thru' */
		case TIPC_LISTEN:
		case TIPC_CONNECTING:
		if (!skb_queue_empty(&sk->sk_receive_queue))
		revents \|= POLLIN \| POLLRDNORM;
		break;

Admin message