Commit ff18f9ef authored Aug 03, 2023 by Paolo Abeni Committed by Jakub Kicinski Aug 04, 2023

mptcp: avoid bogus reset on fallback close



Since the blamed commit, the MPTCP protocol unconditionally sends
TCP resets on all the subflows on disconnect().

That fits full-blown MPTCP sockets - to implement the fastclose
mechanism - but causes unexpected corruption of the data stream,
caught as sporadic self-tests failures.

Fixes: d21f8348 ("mptcp: use fastclose on more edge scenarios")
Cc: stable@vger.kernel.org
Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/419


Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Link: https://lore.kernel.org/r/20230803-upstream-net-20230803-misc-fixes-6-5-v1-3-6671b1ab11cc@tessares.net


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent c8c101ae

net/mptcp/protocol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2335,7 +2335,7 @@ static void __mptcp_close_ssk(struct sock sk, struct sock ssk,

		lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);

		if (flags & MPTCP_CF_FASTCLOSE) {
		if ((flags & MPTCP_CF_FASTCLOSE) && !__mptcp_check_fallback(msk)) {
		/* be sure to force the tcp_disconnect() path,
		* to generate the egress reset
		*/