diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2020-08-07 19:03:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-07 17:26:16 -0700 |
| commit | 7ee2492635d862fac39bc5ef234ffd3d8e9f833b (patch) | |
| tree | 7329742a968e4f3f25562f75c9defe83bb8f57a0 /net | |
| parent | 6bdb6211a61eaf91a22e9160b16795ee6c40f90d (diff) | |
| download | linux-7ee2492635d862fac39bc5ef234ffd3d8e9f833b.tar.gz linux-7ee2492635d862fac39bc5ef234ffd3d8e9f833b.tar.bz2 linux-7ee2492635d862fac39bc5ef234ffd3d8e9f833b.zip | |
mptcp: fix warn at shutdown time for unaccepted msk sockets
With commit b93df08ccda3 ("mptcp: explicitly track the fully
established status"), the status of unaccepted mptcp closed in
mptcp_sock_destruct() changes from TCP_SYN_RECV to TCP_ESTABLISHED.
As a result mptcp_sock_destruct() does not perform the proper
cleanup and inet_sock_destruct() will later emit a warn.
Address the issue updating the condition tested in mptcp_sock_destruct().
Also update the related comment.
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/66
Reported-and-tested-by: Christoph Paasch <cpaasch@apple.com>
Fixes: b93df08ccda3 ("mptcp: explicitly track the fully established status")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mptcp/subflow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 96f4f2fe50ad..e8cac2655c82 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -423,12 +423,12 @@ static void mptcp_sock_destruct(struct sock *sk) * also remove the mptcp socket, via * sock_put(ctx->conn). * - * Problem is that the mptcp socket will not be in - * SYN_RECV state and doesn't have SOCK_DEAD flag. + * Problem is that the mptcp socket will be in + * ESTABLISHED state and will not have the SOCK_DEAD flag. * Both result in warnings from inet_sock_destruct. */ - if (sk->sk_state == TCP_SYN_RECV) { + if (sk->sk_state == TCP_ESTABLISHED) { sk->sk_state = TCP_CLOSE; WARN_ON_ONCE(sk->sk_socket); sock_orphan(sk); |