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 50C90803F6 for ; Mon, 16 Nov 2026 14:58:17 +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 6AGEv4Wk026824; Mon, 16 Nov 2026 17:57:05 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGEv4Wk026824 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="DU8JjWo/" Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGEuuHI026802 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 17:56:56 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGEuuHI026802 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4bb6bbc025aso11174785e9.3 for ; Mon, 16 Nov 2026 06:56:56 -0800 (PST) X-Gm-Message-State: APuU4Z/Nj2cL60aLIYBIIhMVIURrT5eVdB6UGDzadfl7Me0YGKVngh7m MvB5ksNbah4Hc+sbHcvtgMgisT4eCRQBIK1CDS5TgdvqHF7jRm44r/orArrcjYgvxZC3MiCZVDL 2c6VvGJDZ6CJ+b+jnFiwnzjWbq9xbY/fiDj8eZkjdMl+6UDUlizHEAg== X-Gm-Gg: AYBFou3MsWUDtfuA2r/wb3CKjb3EXbwnn61uYwUCcvC1gf1sgreoNYnjWJ+ykpl3GCT aueSOcOHFES2JIVH5GABZLounibn5urnUSzYvVsr6tP4FB9M/a5vQ3qupeT1d7y4ux5RaIp2jnf 5/2aTWkegSepMny9MNXe3Z7lADY+0IEKOokGtlHtg+nceF0zm9wUNuu5VV0INbOtQTewDyxx0UN 9h1EY+RoPGaXmsbX3luoFZa/aaqwsSB7WMjEHdZ71BmqNUFOPW8m2JFp/wTVvt4If845/g3kWNl T+5WXU5rg/paaAjGRWSNEDMm9iFgqqvm7NMsu6khii29Pd6BgZyNTc17Q8Cxru7XM4ZSK3vLw41 1QC+Wwnfi2rTEcsPMrQ8bzoxO7A== X-Received: by 2002:a05:600c:46c9:b0:4a3:d327:6ed with SMTP id 5b1f17b1804b1-4bb55a5fdf6mr241445635e9.17.1794841016494; Mon, 16 Nov 2026 06:56:56 -0800 (PST) X-Received: by 2002:a05:600c:46c9:b0:4a3:d327:6ed with SMTP id 5b1f17b1804b1-4bb55a5fdf6mr241445015e9.17.1794841015966; Mon, 16 Nov 2026 06:56:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794841015; cv=none; d=google.com; s=arc-20260327; b=QXCVLOHCI7PVG/+XpNBJpc7Ts+XE++6h/7PliQkNZfVj5BiLnrRNjC8S94J42obfck f8jq+POJx3lUMaMIgLzr5tBySMyyzva65WhfYLD27yCeZBa8N1WeFYOlbIAZ46Dg+dWD KtVK5DeXhwzBhxabV4ZQbYUk31PIAQRKN+PGbAnWdOsgdCLlPGc763BUwW9uOopaMiM0 OpLErcfUQkBXP2XLCL6RF7X2e+x/O+fG0A7qD3hNOfa7DUldL29GaS3vqSVjkJps5EP6 k3BMZw+qdGyvY0wO3Mpzlvmk9phed509onN1FOYkWT93HZlVXNR754qHhz1mHpsgpMq2 xgog== 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=diGq/bVoBHiDOz2+RtJOUs0gsLnPq7zhYzH0Iy72Bmw=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=ncVxeWpJ+3ShOtMwtymW1RtWdlRxgsiOZxtZjRLWVeIEDYVQnLZ3Zo/0WbawyzkkV7 q4536XLVL3t0onj9b20v05iagnr8N7NgoXyrLiynvPwNizXhjPLWir68K/4M1YAmG+iP dty1sJd49YF8+T+phCOYNhqVvwUx6GwSaU53oMCU4X/K1xxQhf4E5B5Q40JKasy+DsDj YtoSm9RYEow40PqQvVC49SPM4lEm2Vtq/4pVtZbRLj17qUu0u/HPKtPXklcHx+tQYtZf WHsyiA5GyVqAGUgjydlz5ZUoO7wN0qfjTiYUMOrokvquReLRBIXFpLmCvvFf+fVFlghN c1GQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="DU8JjWo/"; 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 5b1f17b1804b1-4bb55afc5b2si214627515e9.6.2026.11.16.06.56.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 06:56:55 -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="DU8JjWo/"; 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=diGq/bVoBHiDOz2+RtJOUs0gsLnPq7zhYzH0Iy72Bmw=; b=DU8JjWo/QnhE nrkifhxPf9ixcJNSocivzdxu24rDpj2T/FaH1DwI4AX6Ry+4IoW8kSAGC180rAMzDYqHSomMC53gr LG7f1uBRrowqFNNR/j5vyWgAogJuVahf02tszhn4vVPd1jt0cj93LFVaLqH2tvGXiFhu22seV4C55 RGjbxDqyK8TLVVxAhZAsVLDZ4ksVHF6KvGJjo8oq6agMslCIrM1YXNvYL6u3YIoMdVCCu5XS64Qog qizytMW9nqcP4RnAqgFjTbI5GL5DtwDpkWgbSp2t0sJKjdR8UesJBx8SN4UgAveO4sRsk1l861Pt9 np9KDAT9SGezNfv9CEMQ7w==; 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 1xSy4O-0053d2-1o; Mon, 16 Nov 2026 15:56:47 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 16:43:03 +0200 Message-ID: <20261116145652.625598-3-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116145652.625598-1-eva.kurchatova@virtuozzo.com> References: <20261116145652.625598-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 2/2] ms/mptcp: fix subflow bitfield misuse 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 subflow status bitfield is protected by the subflow socket lock, with one notable exception: the `close_event_done` bit is actually under the msk socket lock protection. As reported by Clashiko [1], flipping the latter bit may corrupt other entries in the same bitfield. Move the `close_event_done` outside the bitfield, in a 32bit hole. Link: https://lore.kernel.org/178959153492.22033.1944011998010756543@kernel.org Fixes: d82809b6c5f2 ("mptcp: avoid duplicated SUB_CLOSED events") 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/20261013-net-mptcp-misc-fixes-7-3-rc8-v1-2-932c9b182fc7@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit 7538fa33bb2f66b8b809ff39d58308be48e197a0) Rebase note: this tree has neither the "closing" nor the "resetting" subflow flag, nor lent_mem_frag, so __unused grows from 9 to 10 and close_event_done goes after fully_established. https://virtuozzo.atlassian.net/browse/VSTOR-154927 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index baec108dd7e5..b083ca562c79 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -534,13 +534,15 @@ struct mptcp_subflow_context { stale : 1, /* unable to snd/rcv data, do not use for xmit */ valid_csum_seen : 1, /* at least one csum validated */ is_mptfo : 1, /* subflow is doing TFO */ - close_event_done : 1, /* has done the post-closed part */ mpc_drop : 1, /* the MPC option has been dropped in a rtx */ - __unused : 9; + __unused : 10; bool data_avail; bool scheduled; bool pm_listener; /* a listener managed by the kernel PM? */ bool fully_established; /* path validated */ + bool close_event_done; /* has done the post-closed part, + * protected by msk socket lock + */ u32 remote_nonce; u64 thmac; u32 local_nonce; -- 2.56.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel