iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mptcp: close poll() races

Browse Source 
mptcp_poll always return POLLOUT for unblocking
connect(), ensure that the socket is a suitable
state.
The MPTCP_DATA_READY bit is never cleared on accept:
ensure we don't leave mptcp_accept() with an empty
accept queue and such bit set.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paolo Abeni
2020-06-29 22:26:25 +02:00
committed by David S. Miller
parent 76660afbb7
commit 8a05661b2b
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
net/mptcp/protocol.c
View File

@ -1841,6 +1841,7 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
if (!ssock) if (!ssock)
goto unlock_fail; goto unlock_fail;
clear_bit(MPTCP_DATA_READY, &msk->flags);
sock_hold(ssock->sk); sock_hold(ssock->sk);
release_sock(sock->sk); release_sock(sock->sk);
@ -1861,6 +1862,8 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
} }
} }
if (inet_csk_listen_poll(ssock->sk))
set_bit(MPTCP_DATA_READY, &msk->flags);
sock_put(ssock->sk); sock_put(ssock->sk);
return err; return err;
@ -1869,21 +1872,33 @@ unlock_fail:
return -EINVAL; return -EINVAL;
} }
static __poll_t mptcp_check_readable(struct mptcp_sock *msk)
{
return test_bit(MPTCP_DATA_READY, &msk->flags) ? EPOLLIN | EPOLLRDNORM :
0;
}
static __poll_t mptcp_poll(struct file *file, struct socket *sock, static __poll_t mptcp_poll(struct file *file, struct socket *sock,
struct poll_table_struct *wait) struct poll_table_struct *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct mptcp_sock *msk; struct mptcp_sock *msk;
__poll_t mask = 0; __poll_t mask = 0;
int state;
msk = mptcp_sk(sk); msk = mptcp_sk(sk);
sock_poll_wait(file, sock, wait); sock_poll_wait(file, sock, wait);
if (test_bit(MPTCP_DATA_READY, &msk->flags)) state = inet_sk_state_load(sk);
mask = EPOLLIN | EPOLLRDNORM; if (state == TCP_LISTEN)
if (sk_stream_is_writeable(sk) && return mptcp_check_readable(msk);
test_bit(MPTCP_SEND_SPACE, &msk->flags))
mask |= EPOLLOUT | EPOLLWRNORM; if (state != TCP_SYN_SENT && state != TCP_SYN_RECV) {
mask |= mptcp_check_readable(msk);
if (sk_stream_is_writeable(sk) &&
test_bit(MPTCP_SEND_SPACE, &msk->flags))
mask |= EPOLLOUT | EPOLLWRNORM;
}
if (sk->sk_shutdown & RCV_SHUTDOWN) if (sk->sk_shutdown & RCV_SHUTDOWN)
mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP; mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;