Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

mptcp: fix warn at shutdown time for unaccepted msk sockets

Browse Source 
With commit b93df08ccd ("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: b93df08ccd ("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>
This commit is contained in:
Paolo Abeni 2020-08-07 19:03:53 +02:00 committed by David S. Miller
parent 6bdb6211a6
commit 7ee2492635
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/mptcp/subflow.c
View File

@ -423,12 +423,12 @@ static void mptcp_sock_destruct(struct sock *sk)
* also remove the mptcp socket, via * also remove the mptcp socket, via
* sock_put(ctx->conn). * sock_put(ctx->conn).
* *
* Problem is that the mptcp socket will not be in * Problem is that the mptcp socket will be in
* SYN_RECV state and doesn't have SOCK_DEAD flag. * ESTABLISHED state and will not have the SOCK_DEAD flag.
* Both result in warnings from inet_sock_destruct. * 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; sk->sk_state = TCP_CLOSE;
WARN_ON_ONCE(sk->sk_socket); WARN_ON_ONCE(sk->sk_socket);
sock_orphan(sk); sock_orphan(sk);