Commit bcfcc7da authored Oct 08, 2024 by Matthieu Baerts (NGI0) Committed by Wen Zhiwei Nov 08, 2024

mptcp: pm: do not remove closing subflows

stable inclusion
from stable-v6.6.57
commit 8b36f4dcacb91e2c56a3b71790ac1117bb10e03a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8b36f4dcacb91e2c56a3b71790ac1117bb10e03a



--------------------------------

commit db0a37b7ac27d8ca27d3dc676a16d081c16ec7b9 upstream.

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: 58e1b66b4e4b ("mptcp: pm: do not remove already closed subflows")
Cc: stable@vger.kernel.org
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20241008-net-mptcp-fallback-fixes-v1-4-c6fb8e93e551@kernel.org


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>

parent ec4fdd72

net/mptcp/pm_netlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -864,7 +864,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;