Commit db0a37b7 authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

mptcp: pm: do not remove closing subflows 



In a previous fix, the in-kernel path-manager has been modified not to
retrigger the removal of a subflow if it was already closed, e.g. when
the initial subflow is removed, but kept in the subflows list.

To be complete, this fix should also skip the subflows that are in any
closing state: mptcp_close_ssk() will initiate the closure, but the
switch to the TCP_CLOSE state depends on the other peer.

Fixes: 58e1b66b ("mptcp: pm: do not remove already closed subflows")
Cc: stable@vger.kernel.org
Suggested-by: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20241008-net-mptcp-fallback-fixes-v1-4-c6fb8e93e551@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 119d51e2

net/mptcp/pm_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -860,7 +860,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, 
			int how = RCV_SHUTDOWN | SEND_SHUTDOWN;

			u8 id = subflow_get_local_id(subflow);



			if (inet_sk_state_load(ssk) == TCP_CLOSE)

			if ((1 << inet_sk_state_load(ssk)) &

			    (TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSING | TCPF_CLOSE))

				continue;

			if (rm_type == MPTCP_MIB_RMADDR && remote_id != rm_id)

				continue;