From: Quanye Yang <[email protected]>

[ Upstream commit 29afe67082b2d33ab2e90c56c337235d725f023f ]

mptcp_connect() can fall back before the subflow SYN is sent, for
example when the netns is in an MPTCP blackhole, token allocation fails,
or MD5SIG is in use. If the subsequent subflow connect() fails
immediately (EAFNOSUPPORT, ENETUNREACH, ...), __inet_stream_connect()
returns while the socket is still SS_UNCONNECTED and never calls
->disconnect(). This was reported by Clashiko [1].

The error path only dropped the token and moved the msk back to
TCP_CLOSE. MPTCP_FALLBACK_DONE, allow_subflows and
request_mptcp were left as after early fallback, so a later
connect() on the same fd stayed TCP-only.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/633 [1]
Fixes: 0235d075a592 ("mptcp: mark as fallback even early ones")
Cc: [email protected]
Signed-off-by: Quanye Yang <[email protected]>
Reviewed-by: Matthieu Baerts (NGI0) <[email protected]>
Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
Link: 
https://patch.msgid.link/20261013-net-mptcp-misc-fixes-7-3-rc8-v1-1-932c9b182...@kernel.org
Signed-off-by: Jakub Kicinski <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
(cherry picked from commit d47337f3cb2156c674934c22a5ebce38aeecad2a)

https://virtuozzo.atlassian.net/browse/VSTOR-155419
Feature: fix ms/net

Signed-off-by: Eva Kurchatova <[email protected]>
---
 net/mptcp/protocol.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 384ad1a8b5c0..62afc750db43 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3809,9 +3809,16 @@ static int mptcp_connect(struct sock *sk, struct 
sockaddr *uaddr, int addr_len)
         * subflow_finish_connect()
         */
        if (unlikely(err)) {
-               /* avoid leaving a dangling token in an unconnected socket */
                mptcp_token_destroy(msk);
                mptcp_set_state(sk, TCP_CLOSE);
+
+               spin_lock_bh(&msk->fallback_lock);
+               msk->allow_subflows = true;
+               msk->allow_infinite_fallback = true;
+               clear_bit(MPTCP_FALLBACK_DONE, &msk->flags);
+               spin_unlock_bh(&msk->fallback_lock);
+
+               mptcp_subflow_ctx_reset(mptcp_subflow_ctx(ssk));
                return err;
        }
 
-- 
2.56.1

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to