diff options
| author | Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@gmail.com> | 2017-12-28 12:03:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 20:31:11 +0100 |
| commit | 92ae8233467b3a19a50fb02a7ebe065c6de3df17 (patch) | |
| tree | b4da0fdb4527a1bff8d87a3c21e3be667542112d | |
| parent | 201c59bb7ba69fd6a41ac6606d8049b94fb26232 (diff) | |
| download | linux-exynos-92ae8233467b3a19a50fb02a7ebe065c6de3df17.tar.gz linux-exynos-92ae8233467b3a19a50fb02a7ebe065c6de3df17.tar.bz2 linux-exynos-92ae8233467b3a19a50fb02a7ebe065c6de3df17.zip | |
tipc: fix hanging poll() for stream sockets
[ Upstream commit 517d7c79bdb39864e617960504bdc1aa560c75c6 ]
In commit 42b531de17d2f6 ("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: 42b531de17d2f6 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index d50edd6e0019..98a44ecb11e7 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -709,11 +709,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)) mask |= POLLOUT; /* fall thru' */ case TIPC_LISTEN: - case TIPC_CONNECTING: if (!skb_queue_empty(&sk->sk_receive_queue)) mask |= (POLLIN | POLLRDNORM); break; |