| Message ID | 2458c1210f1a164c615e3aa3b9613b085a6c8326.1596819537.git.pabeni@redhat.com |
|---|---|
| State | Deferred, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [net] mptcp: fix warn at shutdown time for unaccepted msk sockets | expand |
Hi Paolo, On 07/08/2020 19:03, Paolo Abeni wrote: > 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. Thank you for this new patch! Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> Cheers, Matt
From: Paolo Abeni <pabeni@redhat.com> Date: Fri, 7 Aug 2020 19:03:53 +0200 > 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> Also applied, thank you.
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);
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> --- net/mptcp/subflow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)