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 0B1148017D for ; Mon, 16 Nov 2026 03:53:38 +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 6AG3qQcZ019278; Mon, 16 Nov 2026 06:52:26 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qQcZ019278 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="AXJY/oOw" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG3qB0X019220 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:52:11 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qB0X019220 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-49337a224a8so1872261f8f.3 for ; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Gm-Message-State: APuU4Z+cPab7Wqha3jYbCL2i5QO9xnzlt1idq+sY+eXVgXhtw2ukn+a1 mZUZ9Bo3mg56AgDil6atVG2RKUTR1mxJta+UmGlcxn2mjHESvj76ZcLXGteh7gsN2fOR4re+flS SnGvNjR2pT8zxdQBK9dqoMxLa3dlM6d+GSYjT9zKEEnVNM4jPQA+GUQ== X-Gm-Gg: AYBFou2gAIzMfoQCICoa6XMeMIMKQFMlGNJ8iVJ9AMR4SIRMaCRihdoE6rftvPNBst7 y/M7Zdn4OegSdIlseSRRBz+Xe//rp9V0Sx1hL7R2Glqb+//ueB7HdT36x8B4dSAnUTMJUceTPko xO769IWqOKVtv/QvRT8phPdhp2H97hDgssr4jquMACwhl6s46JqY3h0dwdiZX7OzBdt1taa5BdB XYq4F5DKU3rRPq9qqJxuwwnFVEwqBbJed4dAowDf/+8y+dxQar89CP2ky5akPeSRG5Jlm3evIZO aeRhKGCpenZNjwk2LQK8wHxUg2wD/bM/5KkoP1XA5bL/EXa2r1UzJylE5G+emLHl+hzrIvPxUnl +wgy1XDQtKnbNt1L8Z3WsC9tp X-Received: by 2002:a05:6000:2912:b0:48e:2a04:4ea3 with SMTP id ffacd0b85a97d-49c6e68daa6mr21544922f8f.8.1794801131501; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Received: by 2002:a05:6000:2912:b0:48e:2a04:4ea3 with SMTP id ffacd0b85a97d-49c6e68daa6mr21544901f8f.8.1794801131047; Sun, 15 Nov 2026 19:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801131; cv=none; d=google.com; s=arc-20260327; b=KZwAIBoZZ88ZIjp0OmFBy/IyYiAPtF72Prn937FERKYeTmKY95FJkCh2LqK+wIuNiQ YikRo2chdUbF0r76c4qRbLqmbscTH/FfutR8jDpMcXMnjjCsghbl/rWIeV9g8JTiu8Ta 3iBFbuQ3B8bnm1H3FVVFS1F/KTl1H4ByM3sYxTLSk2xJsQ9JXGKhWGn8mt8bO9fhUcAa uvEjQSH2occeH5hqMyK03ABWfWPNeu4TSf8fjIcc0i3+8koHUXSoLO7tqK2nQ9T+UMC8 CHCuj1LRU5IAieTNsD/MG7OvdCNtGj2+cy97qzHksbrkPai7dbY1dhxEJI/36Kb/nkHH Rrfw== 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=p1gLg2/q1tBRtYljtWC2ofEYsrgCR9WNaRcWX9TzF+4=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=owK37jesI+LtgFrbkKZlw+HYxV3Ez+NnG8JXl0A4zAwHShnTkmpCvyBU5f5A/A45Nt rdAA5nxj+V8s+xESVEGzyJois23vKtkRc3VTXfmSFdDt21TOr7Jz3yb45RLG6ZedKw4Z OunJSJWhTR/++PtRotaVPRZNeUpwZnBN6ohXWPI+FM6MSn6FqQryo+ibxD2f5kbsSJzP OA9hwXrOIGqAb4g30BxM8drRe6HOypDao3Uds9/9grl9Ux1D/bbmi51zzrmuDV5Qlr+A XhodMokSF8ZHmgWBDsa7mx1T2MkAPz485sniZXyPt2kQMvFYMsY1v8rBiWVxg3wb2jr3 HoMA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="AXJY/oOw"; 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-49c6426cc37si19960939f8f.284.2026.11.15.19.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:52:11 -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="AXJY/oOw"; 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=p1gLg2/q1tBRtYljtWC2ofEYsrgCR9WNaRcWX9TzF+4=; b=AXJY/oOwzkzM aLfl/2A0GWTw1bIbF2if3oKSe1usmmD2VBTrH/CkdOBonEe7NeOMBG0GuRlD9Vb8eo/5TEckV1w3d /cUv3t/ZyTALyUUgCCJoPqJMETfVW44c5DBy3w/iXFSjmDIt5woMg5UFG2X1mbLL6V1HmsYGNiAC1 TwrKioD50xayn5hTG5Yf+pk9IYSpeMlEk4sN4e9A4cN2s9H3jyvQAh/lPkQ4+fQe2joXic76nPIZd it7scYrnUnFqzQQ5PUghid2tPIX+8gLsvcAenFTzYCAlqnDsib4HZCCv0YGbLsFfXmgx86AJAUWZc ZVknn0w+LRDA4le0F3sCJA==; 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 1xSnh6-00A3ol-18; Mon, 16 Nov 2026 04:52:03 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:12 +0200 Message-ID: <20261116035204.564416-6-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> References: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 05/10] ms/mptcp: close TOCTOU race while computing rcv_wnd 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: Paolo Abeni The MPTCP output path access locklessly the MPTCP-level ack_seq in multiple times, using possibly different values for the data_ack in the DSS option and to compute the announced rcv wnd for the same packet. Refactor the cote to avoid inconsistencies which may confuse the peer. Also ensure that the MPTCP level rcv wnd is updated only when the egress packet actually contains a DSS ack. Fixes: fa3fe2b15031 ("mptcp: track window announced to peer") Cc: stable@vger.kernel.org Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260602-net-mptcp-misc-fixes-7-1-rc7-v2-3-856831229976@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit 8ab24fdebc369c0dfb90f82c1650b1e66662bb45) https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/options.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index b9c8205fadbf..420fb529391d 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -571,7 +571,6 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, struct mptcp_ext *mpext; unsigned int ack_size; bool ret = false; - u64 ack_seq; opts->csum_reqd = READ_ONCE(msk->csum_enabled); mpext = skb ? mptcp_get_ext(skb) : NULL; @@ -602,14 +601,11 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, return ret; } - ack_seq = READ_ONCE(msk->ack_seq); if (READ_ONCE(msk->use_64bit_ack)) { ack_size = TCPOLEN_MPTCP_DSS_ACK64; - opts->ext_copy.data_ack = ack_seq; opts->ext_copy.ack64 = 1; } else { ack_size = TCPOLEN_MPTCP_DSS_ACK32; - opts->ext_copy.data_ack32 = (uint32_t)ack_seq; opts->ext_copy.ack64 = 0; } opts->ext_copy.use_ack = 1; @@ -1296,19 +1292,14 @@ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) return true; } -static void mptcp_set_rwin(struct tcp_sock *tp, struct tcphdr *th) +static u64 mptcp_set_rwin(struct mptcp_sock *msk, struct tcp_sock *tp, + struct tcphdr *th, u64 ack_seq) { const struct sock *ssk = (const struct sock *)tp; - struct mptcp_subflow_context *subflow; - u64 ack_seq, rcv_wnd_old, rcv_wnd_new; - struct mptcp_sock *msk; + u64 rcv_wnd_old, rcv_wnd_new; u32 new_win; u64 win; - subflow = mptcp_subflow_ctx(ssk); - msk = mptcp_sk(subflow->conn); - - ack_seq = READ_ONCE(msk->ack_seq); rcv_wnd_new = ack_seq + tp->rcv_wnd; rcv_wnd_old = atomic64_read(&msk->rcv_wnd_sent); @@ -1360,7 +1351,7 @@ static void mptcp_set_rwin(struct tcp_sock *tp, struct tcphdr *th) update_wspace: WRITE_ONCE(msk->old_wspace, tp->rcv_wnd); - subflow->rcv_wnd_sent = rcv_wnd_new; + return rcv_wnd_new; } static void mptcp_track_rwin(struct tcp_sock *tp) @@ -1472,13 +1463,25 @@ void mptcp_write_options(struct tcphdr *th, __be32 *ptr, struct tcp_sock *tp, *ptr++ = mptcp_option(MPTCPOPT_DSS, len, 0, flags); if (mpext->use_ack) { + struct mptcp_sock *msk; + u64 ack_seq; + + /* DSS option is set only by mptcp_established_options, + * the caller is __tcp_transmit_skb() and ssk is always + * not NULL. + */ + subflow = mptcp_subflow_ctx(ssk); + msk = mptcp_sk(subflow->conn); + ack_seq = READ_ONCE(msk->ack_seq); if (mpext->ack64) { - put_unaligned_be64(mpext->data_ack, ptr); + put_unaligned_be64(ack_seq, ptr); ptr += 2; } else { - put_unaligned_be32(mpext->data_ack32, ptr); + put_unaligned_be32(ack_seq, ptr); ptr += 1; } + subflow->rcv_wnd_sent = mptcp_set_rwin(msk, tp, th, + ack_seq); } if (mpext->use_map) { @@ -1706,9 +1709,6 @@ void mptcp_write_options(struct tcphdr *th, __be32 *ptr, struct tcp_sock *tp, i += 4; } } - - if (tp) - mptcp_set_rwin(tp, th); } __be32 mptcp_get_reset_option(const struct sk_buff *skb) -- 2.56.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel