From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7F103803BB for ; Tue, 17 Nov 2026 07:48:52 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AH7kZBn004449; Tue, 17 Nov 2026 10:46:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AH7kZBn004449 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="EcHCinQ1" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AH7kUbB004432 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 10:46:30 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AH7kUbB004432 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-49d70f45b22so1556785f8f.2 for ; Mon, 16 Nov 2026 23:46:30 -0800 (PST) X-Gm-Message-State: APuU4Z+5+bk/3/FKo63rx8YHxGCh9ZcKs16T+UQVBkxz7Q0et1yT7eXe Gj8ATRnPMosMnkUbYQijzmnSIN1QO7YBO6dOyeu0g7tOaPce8u3SRakRJF/DAwknRoc3j7bPM/u tuEEH8nQxJ34VDJklVe2WjqCpoocBz3BIuv7RgWpSdM4OPNNSxAlQCA== X-Gm-Gg: AZFdTZcpgNGFuQrrS3hIlDv6IXo/PcGWeK1iaQS86qw9aIT8/eebWprTKjJgg8aa9Oe pvMTtjZsPJ6bs3PnGwcFFXNc7JZ9lxUU8fzwEwx/UHL0HxAPwBkLLZZY8PdJbVVALM8cIdLW/Vy gCbRx0fppc5/qdP9CfAC2dJQia4Sn6gFLnpEgxKjJ57rs/wxDzQcH73Q76lNLv0H6Gr3ZFn7F3R cr72EuQsx/qECvspLw7K2+5Re/F4Gm5eztONWseHBFpRk2K5y1k2CManm1cWFn962NIZyf0apUA AB5pvfk6Mf10PSkYB9mR3FxsV+6rdJlBVL17joywyljuuevLo1nGWW0f6+sf1uS/UzCiHanWBEi IkCW0ZOTDrARH81b7LgVesmgypQ== X-Received: by 2002:a05:6000:2085:b0:48e:4e00:b737 with SMTP id ffacd0b85a97d-49c73a050e5mr29741152f8f.54.1794901590009; Mon, 16 Nov 2026 23:46:30 -0800 (PST) X-Received: by 2002:a05:6000:2085:b0:48e:4e00:b737 with SMTP id ffacd0b85a97d-49c73a050e5mr29741126f8f.54.1794901589539; Mon, 16 Nov 2026 23:46:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794901589; cv=none; d=google.com; s=arc-20260327; b=WH0SMDCGYgYaZKplkifgELNWut+EoYES0Hv49hkmJgz/weF8refZcFpvntYD9iMbQH OfCdMvttwdo5PBZfzSLaJCR/6d2haIVh/W+CFRAnG2d/4a6T6Cz+5TsBgfxsZxpoWdFO 4DR74ma1pZoNs3h+wxsxfRzsquW33NsZzmtWa2vVX862jWTPAsxxCZajknbr3ovr3g7j 8svGzreRaXHjoUg1Xp6dgj1vEhTtTD3Fb/2U1lXFwlnbSsuqhmwGuPGxGuu/2Wrdd+iH y7JCnKIGlJKGjC9r0mNtXT8OaXzVAUvAOxy4hFOrOu96NHDJ5u3uzZm6XuLAud+leWSx a44w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=dLNXhRTyOzhXZcYi/6StoYZXrbVkkx47JUZ8VdTGU7Q=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=JGyZkjrSvPuKKWbDjcrz5ao56kERS+MyTIrptsjKj+I4/TPQW4Zt3Ajzg4hQGnJFLv RlpYmKFSAIxVH+XBRPzuiIbdqxK4vrtwfpW5vk5nD7pqnFJBkqe1BjuAxV2z7Ze/+YTg Q8BgrlsQtwJAPqtlvpwA1wVseUwb9BQJ0FR/unKVPjPS208InXRkZ3nWV4mnyQsftNj5 KwSoAesy5Sysb3ZxyuFaAAfF+frTDuYVMQeiw9QyTSQz92/8UR3sBlWVcEwF1id+D1n/ oMTxH7Vmd92SRS2SZA6swScZZQWVff0h3sAzIZ3LVSjLcFXcYgpuTLnlgfARDhAfE2O+ +UhQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=EcHCinQ1; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-49c6482c03fsi26650727f8f.356.2026.11.16.23.46.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 23:46:29 -0800 (PST) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=EcHCinQ1; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=dLNXhRTyOzhXZcYi/6StoYZXrbVkkx47JUZ8VdTGU7Q=; b=EcHCinQ1oQma KGjE1lZXpZC5DAcyqBKCH+KtVVzXZyV1Fi3kMkpy2ihZHKvINfWlJHgO7RCZ0ZtHqRafhZclEYpn/ LH/cZTU8zxSBPvTh8a80CLeI4zSHmN/xOifd0o+lHzH4d3cwrUkH3l9yiOxnmAlM3zyLDpEo2vR/F GkJZobMXpIReUjq6VoFYlssNCzFzEQQIbDMFSqDGDEYyZwQjRC55w+hgg8rQV33AhsS71k3s810Df tIDQTEALdM3SWB9ncVOVepGIOxaHr2S3DTokCGnKei023jIKRQj3kfdX9OvZ0K6QfrQ12C9fzpsnF 9M8x+Dei6XHkdStGClWbXQ==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xTDpN-006Zss-03; Tue, 17 Nov 2026 08:46:19 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Tue, 17 Nov 2026 09:44:51 +0200 Message-ID: <20261117074627.820727-2-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261117074627.820727-1-eva.kurchatova@virtuozzo.com> References: <20261117074627.820727-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 1/2] ms/mptcp: reset msk state on early connect failure X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Quanye Yang [ 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: stable@vger.kernel.org Signed-off-by: Quanye Yang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20261013-net-mptcp-misc-fixes-7-3-rc8-v1-1-932c9b182fc7@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin (cherry picked from commit d47337f3cb2156c674934c22a5ebce38aeecad2a) https://virtuozzo.atlassian.net/browse/VSTOR-155419 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- 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 Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel