Skip to content

Commit 3fffa15

Browse files
Paolo Abenidavem330
authored andcommitted
mptcp: ensure subflow is unhashed before cleaning the backlog
While tacking care of the mptcp-level listener I unintentionally moved the subflow level unhash after the subflow listener backlog cleanup. That could cause some nasty race and makes the code harder to read. Address the issue restoring the proper order of operations. Fixes: 57fc0f1 ("mptcp: ensure listener is unhashed before updating the sk status") Cc: [email protected] Signed-off-by: Paolo Abeni <[email protected]> Reviewed-by: Matthieu Baerts <[email protected]> Signed-off-by: Matthieu Baerts <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 80de809 commit 3fffa15

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/mptcp/protocol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2909,10 +2909,10 @@ static void mptcp_check_listen_stop(struct sock *sk)
29092909
return;
29102910

29112911
lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);
2912+
tcp_set_state(ssk, TCP_CLOSE);
29122913
mptcp_subflow_queue_clean(sk, ssk);
29132914
inet_csk_listen_stop(ssk);
29142915
mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CLOSED);
2915-
tcp_set_state(ssk, TCP_CLOSE);
29162916
release_sock(ssk);
29172917
}
29182918

0 commit comments

Comments
 (0)