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 4C5068017D for ; Mon, 16 Nov 2026 20:47:34 +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 6AGKkNUD031638; Mon, 16 Nov 2026 23:46:23 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkNUD031638 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="ncE4/+y3" 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 6AGKkABO031587 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkABO031587 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-492d47f142cso158307f8f.0 for ; Mon, 16 Nov 2026 12:46:10 -0800 (PST) X-Gm-Message-State: APuU4Z+aO6SMBOEIirOEXDFDYqDvRaMiBn5Nhd6ufU58e7JOvBFGqdJ4 4LBkHSClw1diAwJekEtkRV8Iio9ajiIdQAVJSuJFu7cnIfoQXJy46PYrroUv8HlaSldgK1XzKYu HX+8mWoxLKy0wO91qItU6DhwVnnVmz6Lizd0Y1XDV8z/hiUGGwYyN0A== X-Gm-Gg: AZFdTZfMU0G8FK2qMEMTSDZ+OvZWITzDFV/RPiNlNJAVmEio9NWZ4Cni1SqheVm4zeg QA5FnTu2jWYCC/Sk2RIYX+MR5B401kUAbnJysGDz7+KZlc+GS3VS+dFoEoKt243TcO/C0Ckqvq+ jsyimYpZiYsq9qSJSD0YCAxvKgq81k+4NBh4wOtIdTiGlPlfg1PCb413iwAPDxuSjIMKN/ojKVw pWhRS1cwK1EISPoWnBTOA/Fk5Ybe+AN3GDdxbJLNCOYExbcPigjLJ9IOtM8AFbQJvxA0DRfZWmY xeqnbmYATJAojc1Ov3C49bOFmENahaL4IXbiWbtP9TZ1MHH+I5B9NA0i+x9hBUFKhX+UHZuCoT1 jM7fMQ6qOG+N1ZAnKAPJXLu6T2Q== X-Received: by 2002:adf:e010:0:10b0:490:1395:9b00 with SMTP id ffacd0b85a97d-4a372a3c703mr1000690f8f.10.1794861969919; Mon, 16 Nov 2026 12:46:09 -0800 (PST) X-Received: by 2002:adf:e010:0:10b0:490:1395:9b00 with SMTP id ffacd0b85a97d-4a372a3c703mr1000656f8f.10.1794861969380; Mon, 16 Nov 2026 12:46:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861969; cv=none; d=google.com; s=arc-20260327; b=rU4vA52q95mKw0C8mANWeog+yiZ8eB26952fWCvndviKJ32hSerFWcwIj8QcBHQN6g lEUqlqoYiuW3Wnyp5HIooxdYSJCMS2r0nCfA+JRmthnuCX1rlUYmjn/HzbFmasnZaHK1 NSxs65EJGF7rsmBZAZPGXDebDdWmwh/lGFhYHG1d7/DNdhLG+q4Nrd1PG/UK8SUcZbpU lbDlcfXAAqqf4VDOB8KmH0LP7UFOqvcuEw1w9A3LJPA9hDH2PwsaE6S4B/AVZamnlS4P AVjrNTvrTqYRzXYMaKF2jlpT5IpRbvKt46/z4z49uXwj/vfd1PirKzL4I8M0OvLcEZIC PNRg== 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=P0X7G4ZeA484vI09a8nbuJyivSvFekMmg2e0iaG+oBI=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=mo712GjzFQ6gtniHLAt8iBLIs+ToKDBOaWnBxv+zBO9r+7lQhr1uBnPFHHyG3cbCOV GHCi7Ed2VPuC9OqFykluMqk7BW/9oX2urqY3GRziE7T3Yik+W2J+a0gxfuoXTeXbcggf J/HEVB4JJw4FbGJt77i5anf3ef9tzKajASqp0m3WxsZD3Kp17jsbdiPF0rVa7yjtX6M/ MFLXSJ8MdeMq76uUaKkSHqi/OWMGHdmgv63+Ks02lr+sFyyLSY58sEiudegbjPgAWofM /geMZj7ipBFk7D1ShvALTVem8eLyzt7r3VqWkCocBGNj4hZ9f4WIGRpH+W26cHOKVANB 1Gxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="ncE4/+y3"; 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-4a310943c52si1953144f8f.434.2026.11.16.12.46.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:09 -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="ncE4/+y3"; 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=P0X7G4ZeA484vI09a8nbuJyivSvFekMmg2e0iaG+oBI=; b=ncE4/+y3u+7i 593sgKRTZzYsl2wiAwEXpeEmhLNkWEAjlnA8/ce4DWeqRQ3tdUcjA/dRbJZs+d3t/86C20eZgDi3f f/Z4ryZcCiSJoPVj0SuMFeu0sE1kqAKVUTpL1D62I25lFZ9LLTuPis6rBqgNQDffGd7mRx60vC3E+ ekdf5DllyPLd2zQERg7x8Ods9kpX+aEROqcm04bFZBrZQqJVQR2WAQN/Ah8lFmk/UzkcUq2A3bnT6 8aA+yf6iTno6A9c9bFuwtV2PngaWc1aSxG1uSmkSx7gDoDrM/XSKHBhOpYPdkzPmptiLt4tKgzWOk vBY2L0Dvs5rX0iPpe29s0g==; 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 1xT3WL-00BfjZ-0Y; Mon, 16 Nov 2026 21:46:00 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:05:57 +0200 Message-ID: <20261116204557.718500-6-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> References: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 05/11] 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 bdc2b71a89e7..51978cf24f23 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -577,7 +577,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; @@ -608,14 +607,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; @@ -1302,19 +1298,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); @@ -1366,7 +1357,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) @@ -1478,13 +1469,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) { @@ -1712,9 +1715,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.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel