Commit 5c835bb1 authored Jul 08, 2022 by Paolo Abeni Committed by David S. Miller Jul 11, 2022

mptcp: fix subflow traversal at disconnect time



At disconnect time the MPTCP protocol traverse the subflows
list closing each of them. In some circumstances - MPJ subflow,
passive MPTCP socket, the latter operation can remove the
subflow from the list, invalidating the current iterator.

Address the issue using the safe list traversing helper
variant.

Reported-by: van fantasy <g1042620637@gmail.com>
Fixes: b29fcfb5 ("mptcp: full disconnect implementation")
Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 72a0b329

net/mptcp/protocol.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2919,12 +2919,12 @@ static void mptcp_copy_inaddrs(struct sock msk, const struct sock ssk)

		static int mptcp_disconnect(struct sock *sk, int flags)
		{
		struct mptcp_subflow_context *subflow;
		struct mptcp_subflow_context subflow, tmp;
		struct mptcp_sock *msk = mptcp_sk(sk);

		inet_sk_state_store(sk, TCP_CLOSE);

		mptcp_for_each_subflow(msk, subflow) {
		list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);

		__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE);