From nobody Sat Aug 15 20:33:09 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57799429CDC for ; Fri, 31 Jul 2026 13:36:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505013; cv=none; b=XJ6EX72vF20lt6NQG8yp6rUJVtXT+SCHPTUsu21QYHcmO/sQTiapfseBA2pVzypliQmOaaytxNoob649T0K4o1D7FR769gsS0Aawra4IiuvdQaEEJHydVGp/KpY3frtwMUAWqX3dZwqOFC4P55nZd4wc00ahHxKGCJNrLen9QUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505013; c=relaxed/simple; bh=3d61TPLDedwu55k65Rj+GmTJA7yfGLv/8fURSSZB+uI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CTbcPZOx05X7FXK7D7HpuqpmRjIbSHb/gT8twPlVPeqBh7rd7M5UpCS/fEPcBpL7YTUZau+/LQYwQ00W2S9LoovcA5lrXg5mvAs9p5H2RoewdDMhVZ+og4c7tFV39cPMtqBrHfQ98FTGt1LtKO0GM7eWAT/DCjTA7c3Hu6dNeT0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LW09j/5j; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LW09j/5j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 710AD1F00A3A; Fri, 31 Jul 2026 13:36:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785505008; bh=HtroDACWq0gaAnsjTD2gAENEKJNiDGnQStiDyEN4k0M=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=LW09j/5j965BhbXDcy6m+Px9CFJzzeSnHNa3GFPZ3JqACR1s9Kv7oio2wAureLg/e lQRAukMFRmnCLEqxYC8DSHXhNOG0oV3j1jNbA5F9ebEg2r+NW36rCi4hfcfb+RHZXI wgi9o/i7VtEn1lGfKTBDIFgrVW6Xoua0sfrxIU7Y1T//5YNSBCPDb4rwvCYF/MhXJ1 lLm95T8ygAZOGItALzOWkhgjPy9PgvFA0I2szHNnZAPs3uE4ll0jiknsnmUpl5Wdxu dyA+B+0zppGBsHEhIzKoUz7q9sl3DKdTcxfOzBBmTOgbmhFhrb5A8aWBImGTNhkqDQ U2tdWrm2eOjFA== From: "Matthieu Baerts (NGI0)" Date: Fri, 31 Jul 2026 15:35:35 +0200 Subject: [PATCH mptcp-net 1/4] Squash to "mptcp: avoid combining some incoming suboptions" Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260731-mptcp-squash-fix-7-2rc6-v1-1-cfe460beb666@kernel.org> References: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> In-Reply-To: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2329; i=matttbe@kernel.org; h=from:subject:message-id; bh=3d61TPLDedwu55k65Rj+GmTJA7yfGLv/8fURSSZB+uI=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJylrzROKDSPW/lrJMHZK2DHmxNmGwkqdzRZiDH/Y5L8 NaJ+4fKOkpZGMS4GGTFFFmk2yLzZz6v4i3x8rOAmcPKBDKEgYtTACbSIMDw3+f7Ro5T394t42fb PMXnQknKe6U+9vY3z7oX9D7qcAyM/s3IcF333BrBif9aEoxCmL4eeHntcmpjikWY43JGs8WHl/L 6MQEA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Another stack could send a FASTCLOSE on a plain ACK, with a DSS. That's when they follow the "Option A" [1], while here, the "Option B" is implemented on the sent side. So we need to allow that, and this seems to be handled by the stack in mptcp_incoming_options(). Note: this note should be added in the commit message: Note that now, combining both an MP_CAPABLE and an MP_JOIN will no longer result to a reject of the two options, but only the second one. That seems OK to do that for this unexpected error. At least now all inconsistent combinations are handled the same way. This could change later. Link: https://www.rfc-editor.org/rfc/rfc8684.html#section-3.5-5.1 Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/options.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index d6b009319839..5611de38f4d9 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -170,6 +170,7 @@ static void mptcp_parse_option(const struct sk_buff *sk= b, if ((mp_opt->suboptions & ~(OPTION_MPTCP_ADD_ADDR | OPTION_MPTCP_RM_ADDR | OPTION_MPTCP_PRIO | + OPTION_MPTCP_FASTCLOSE | OPTION_MPTCP_FAIL)) !=3D 0) break; =20 @@ -357,8 +358,9 @@ static void mptcp_parse_option(const struct sk_buff *sk= b, break; =20 case MPTCPOPT_MP_FASTCLOSE: - /* Can be used only with RST */ - if ((mp_opt->suboptions & ~OPTION_MPTCP_RST) !=3D 0) + /* Can be used with a restricted number of other options */ + if ((mp_opt->suboptions & ~(OPTIONS_MPTCP_DSS | + OPTION_MPTCP_RST)) !=3D 0) break; =20 if (opsize !=3D TCPOLEN_MPTCP_FASTCLOSE) @@ -1478,7 +1480,7 @@ void mptcp_write_options(struct tcphdr *th, __be32 *p= tr, struct tcp_sock *tp, * RM | C | C | C | P |------|------|------|------| * PRIO | X | C | C | C | C |------|------|------| * FAIL | X | X | C | X | X | X |------|------| - * FC | X | X | X | X | X | X | X |------| + * FC | X | X | P | X | X | X | X |------| * RST | X | X | X | X | X | X | O | O | * ------|------|------|------|------|------|------|------|------| * --=20 2.53.0 From nobody Sat Aug 15 20:33:09 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CFF142A165 for ; Fri, 31 Jul 2026 13:36:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505013; cv=none; b=e8+PMrQGX5mrjPWlueot2WRWd1XFRdB3sscuRWWLxHeubNHg0OVYy/fYih1a2jqr1VH90MMOY+JIQxN7BN0p7Ojo4PuVV46s0iH35iLHDCXEJo+V+eJ1GAvkFm/EJe+Ori8KLMGVkOpUVjkpTEQH78XtX4kfM4zE3itKCoOa+p0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505013; c=relaxed/simple; bh=TxywdlczJNNYW5Yuyz8Jn9+pnQu7T2G2mfXN9ISwZYM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Iz9XcAALVR4SDnsWV4Y3qBjwbscnoWCihfmG/JFuEP6ZokDwqOb1H+i82N1LseGtRlRNp0kb0v4e6TJz7nvBmoSUraf/tdnSuRemdAYvwvGbibCyJcM0hsQZ2E1idt30wB9ZCWzBGF72JjQhA7AUXxem0ShBeYRGClMW9E97/eQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ni/FhOk/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ni/FhOk/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43ED91F00A3D; Fri, 31 Jul 2026 13:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785505009; bh=a4AlyqJAyOiO5TpCS+oh4/m3B0UurQMtrFxmYkoG1C8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ni/FhOk/QBEsyWU09nPUTArQcOLU8bWWCr6KI1hSQFJnGD8W3Ol6+zOwVTKyRaXzt PMh2/M89LREmzrvSw/3V+o/jOwkATKobBzkVl3Mr4ij2BVud9sDAbts4YS++dNeD4i 4mdQRqSHGa+ndl88qgjzJ6gb35+ectnsrj7hMEl15wr4mF44Kcu6iwCHENZrv1GEdk R+Bd9V83Z8va9+h0Z7bWEVxXQkOYIZ4Q8OGpLmQeqzLBiaRf9Fc1ySOChQ2+/WrMQJ TERO8TPPFGWCVEv2OtvK8y7aWBNVsknWeVaxbr56Amu54SNFEfPQGVH1UGRNGc+Xbo q+2yde5PXeh1g== From: "Matthieu Baerts (NGI0)" Date: Fri, 31 Jul 2026 15:35:36 +0200 Subject: [PATCH mptcp-net 2/4] Squash to "mptcp: reclaim forward-allocated memory on RX path errors" Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260731-mptcp-squash-fix-7-2rc6-v1-2-cfe460beb666@kernel.org> References: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> In-Reply-To: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=793; i=matttbe@kernel.org; h=from:subject:message-id; bh=TxywdlczJNNYW5Yuyz8Jn9+pnQu7T2G2mfXN9ISwZYM=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJylry9zhe/62MjdxtzU3RMmeiSm/7/I8WT30TfT9tva 18hxrGho5SFQYyLQVZMkUW6LTJ/5vMq3hIvPwuYOaxMIEMYuDgFYCKCyxj+R7cJq97S8VvN7HI8 530Ez8VLd7Y3OSyK7GrzDSr2ZrPWZvgflTSDleFJxTdtpnX3Ju16qOjxUfb4t/wwNi4Rhj1bt03 mAgA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Follow the same style as in most places in MPTCP. This was the previously enforced style for netdev. Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 90dc894cb976..3dee08862027 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -149,8 +149,7 @@ struct sock *__mptcp_nmpc_sk(struct mptcp_sock *msk) =20 static void mptcp_drop(struct sock *sk, struct sk_buff *skb) { - /* - * The skb forward memory was already transferred to sk by + /* The skb forward memory was already transferred to sk by * mptcp_borrow_fwdmem(), even before setting the destructor. */ if (!skb->destructor) --=20 2.53.0 From nobody Sat Aug 15 20:33:09 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AB7C42642D for ; Fri, 31 Jul 2026 13:36:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505017; cv=none; b=neIFnEBbwUsENfC6tI8HRb8OTVY81/VYrWCzF36r+DqpDAGirNYPPzsKGLFMhvNAmeZNDWwOyDNv1Hgp3rBh7ljb3rntL3BiLDvSUF7EDJvnhH5NSgLEmMAffhz8KTlvqOOzYP2I2pwXUh6LFJHKdvNoXmjorLvJ8VPgpCFTFhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505017; c=relaxed/simple; bh=Q8LI2wLClKWgMdcNNGOaC0V0Mu1v6FgmHKgz2+Jc7GU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LiazsgAmp+pgseKgiE2Qojr2s9AUR6AsdiS91FuHF6mWE9Je8jLYSqoJh5wqpoBwSd1eY5QPVoyhK6/Bj3SsHbRt9i0AbI7z6ai3fZW+EvJnyth572Rf7KZwP1UGFC2UlrFiIYnxnet2mLXX5FgEZaDhqPfxE3OplXDriKWGF7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EVohs6oa; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EVohs6oa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16B3F1F00A3E; Fri, 31 Jul 2026 13:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785505010; bh=BQce/aYFDIi/uehmDusbV6BuB7vBsnRhRNQdFsfExog=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=EVohs6oaLALIzoNi6DzGZq7JUflBiEOwXjZ4t0bECYpZbKZ7W+QdOJ6bXFitGxpO7 pY6APxHM0iaPNv4IFJoormunMjBxcZnW9GGzCNEfFu1jhymWPXsIbRNVP+rWzD2hjF NUufsuVa3Pz04GWvdJ5mophsaB5grL8Tq8ewvYdS36J+IEuKaD2dtCyPzVjm36NzvH OUK6UEXh839fX6shW8ut09yDunl/PqXHgmVsnIiHSiud3GzMcaB259Y1sNiuJ/srJN 7FQo/2RPu1ayVyTbDA+oLQBuHEoj4eSqhj5hyy+a6mBBOvtY/Beisb4x/bcwZDwHvQ /pjAaQUsjcMhw== From: "Matthieu Baerts (NGI0)" Date: Fri, 31 Jul 2026 15:35:37 +0200 Subject: [PATCH mptcp-net 3/4] mptcp: options: reset DSS fields in case of unexpected size Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260731-mptcp-squash-fix-7-2rc6-v1-3-cfe460beb666@kernel.org> References: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> In-Reply-To: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1395; i=matttbe@kernel.org; h=from:subject:message-id; bh=Q8LI2wLClKWgMdcNNGOaC0V0Mu1v6FgmHKgz2+Jc7GU=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJylrxjY7lZuPeA2+VpfYxVgtNvxLY8lpMLjbta7PL9h UR0pgJfRykLgxgXg6yYIot0W2T+zOdVvCVefhYwc1iZQIYwcHEKwETUjjP84XkkHvCkh2X2nVmL 3npxPNSQdV3rOj3SIGb1wvN6ktLLAhkZdqmmns4zF/IsLVL0EytZY/ZMYXV50o/SGItwTWfRuCI OAA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 A remote peer could send a malformed DSS with a wrong size, followed by another DSS or MPC + Data. In this case, the first suboption will be ignored, but leaving some fields written, which could lead to inconsistency or access uninitialized data. Explicitly reset the fields that could have been modified in case of unexpected size. Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260728-net-mptc= p-misc-fixes-7-2-rc6-v1-0-f7e2d229159d%40kernel.org?part=3D1 Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path") Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/options.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 5611de38f4d9..dd75fef7f046 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -209,8 +209,14 @@ static void mptcp_parse_option(const struct sk_buff *s= kb, * RFC 8684 Section 3.3.0 checks later in subflow_data_ready */ if (opsize !=3D expected_opsize && - opsize !=3D expected_opsize + TCPOLEN_MPTCP_DSS_CHECKSUM) + opsize !=3D expected_opsize + TCPOLEN_MPTCP_DSS_CHECKSUM) { + mp_opt->dsn64 =3D 0; + mp_opt->use_map =3D 0; + mp_opt->ack64 =3D 0; + mp_opt->use_ack =3D 0; + mp_opt->data_fin =3D 0; break; + } =20 mp_opt->suboptions |=3D OPTION_MPTCP_DSS; if (mp_opt->use_ack) { --=20 2.53.0 From nobody Sat Aug 15 20:33:09 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAFA1426EAD for ; Fri, 31 Jul 2026 13:36:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505019; cv=none; b=kodl+RNP/4qJUhRDygQBP0q7bzNwfvI6tYyKTd79iMxMgKbMZyAQHorOKEkto0f3mjlm6J4NYz6+J9eWSFiAlBsDgH8aKhOcmKlGa//1cSWJ8M+hqHjqTC9kccmkhJE/NFeqNUmI0SMNRLusw+E4ON8/HRFYVmGiKqqstZVmVRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785505019; c=relaxed/simple; bh=A/1kUH51wJGNQJ1e/m0OL4JrNZeyNVOFalxF9ZgyO8U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qHDYTg7h5fbfiCNboSYZfZq3Pwvyvr6Ez1/5znrT3jWpWM+x6XqwlQ0yfgPRC3elkx74S6wjwsb2DcjtdTBXc4V3wS/QTLqJ7mKS9uyf2ixb4XirztKQHud+y+1t5NGze4+z7vAdXdIRoT9V+Ry6TZyxPZDfUrZZxJzyApikKTw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q7phLt1v; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q7phLt1v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDC541F00A3F; Fri, 31 Jul 2026 13:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785505011; bh=zMrRwDSQPruKPueTszchR0AK15jiRZ/ywP7bgU7cZcs=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Q7phLt1v5GJlO5bqGBBFVbb/pGovk4UeD/KVMviPU0JgOCjZeXKILzrj+ZLZ8+ZQA fXXgP40khulPTkq/G3y4Ylu2dcRyDgclNoKYCYCK0OVMUmW0i5GXn9Gx+XqrpKNMz3 fGrWkogMyy99bAdatiR5+6vgZigISMOfVULoBmv40s61cPTJgnWnYLY9gmP9I1qTxJ eYeUhpNh5oQKd/ZwOSpz6Ka5bpX6WUGnOL4i8lmQP+BHdym49txdBoC42wUCuybeC6 2kE+XKiPQ7ok6ROiBYrmO4nmn26IJgm2Qpz338bDWU3CWIzVpKJxQnlobSRvIMCZAX gAS5r4g4LpQjw== From: "Matthieu Baerts (NGI0)" Date: Fri, 31 Jul 2026 15:35:38 +0200 Subject: [PATCH mptcp-next mptcp-net 4/4] mptcp: remove MPC && MPJ check Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260731-mptcp-squash-fix-7-2rc6-v1-4-cfe460beb666@kernel.org> References: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> In-Reply-To: <20260731-mptcp-squash-fix-7-2rc6-v1-0-cfe460beb666@kernel.org> To: MPTCP Linux Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1303; i=matttbe@kernel.org; h=from:subject:message-id; bh=A/1kUH51wJGNQJ1e/m0OL4JrNZeyNVOFalxF9ZgyO8U=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLJylrx/JXZM6rTqkdnTTRhT9goHnuc67rlWZv7m6E2L1 4j7/d3e2FHKwiDGxSArpsgi3RaZP/N5FW+Jl58FzBxWJpAhDFycAjAR91+MDGeUjv8Qqls/48H7 EDe75afDSiUsK2UPTJT5+2ZS7a5vXYmMDE+T7zScFI4vCXzxs/3oRM4jqXxKOx7y2a3ZuOifmO2 GJ1wA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 After commit < TODO > ("mptcp: avoid combining some incoming suboptions"), the parsing step no longer allow to have both the MP_CAPABLE and MP_JOIN suboptions set together. These checks can then be removed. Signed-off-by: Matthieu Baerts (NGI0) --- Note: the commit "mptcp: avoid combining some incoming suboptions" is not upstream yet, hence the TODO for the SHA --- net/mptcp/subflow.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 8e386899ceb9..e1f20ff8fdb4 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -174,8 +174,6 @@ static int subflow_check_req(struct request_sock *req, =20 if (unlikely(listener->pm_listener)) return subflow_reset_req_endp(req, skb); - if (opt_mp_join) - return 0; } else if (opt_mp_join) { SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_JOINSYNRX); =20 @@ -277,9 +275,6 @@ int mptcp_subflow_init_cookie_req(struct request_sock *= req, =20 opt_mp_capable =3D !!(mp_opt.suboptions & OPTION_MPTCP_MPC_ACK); opt_mp_join =3D !!(mp_opt.suboptions & OPTION_MPTCP_MPJ_ACK); - if (opt_mp_capable && opt_mp_join) - return -EINVAL; - if (opt_mp_capable && listener->request_mptcp) { if (mp_opt.sndr_key =3D=3D 0) return -EINVAL; --=20 2.53.0