[PATCH net v2 0/8] mptcp: misc fixes for v7.2-rc6

"Matthieu Baerts (NGI0)" <[email protected]> Mon, 03 Aug 2026 18:16:32 +0200
Newsgroups dev.linux.lists.mptcp,org.kernel.vger.linux-kernel,org.kernel.vger.linux-kselftest,org.kernel.vger.netdev,org.kernel.vger.stable
Message-ID <20260803-net-mptcp-misc-fixes-7-2-rc6-v2-0-b8f496d71664@kernel.org>
Here are various unrelated fixes:

- Patches 1-3: harden incoming MPTCP suboptions parsing by rejecting
  non-combinable ones. Patch 3 removes unreachable code after patch 2
  added here for consistency, and to reduce comments from AI reviews.
  Fixes for v5.6.

- Patch 4: fix a data race in the ADD_ADDR timer callback. A fix for
  v5.13.

- Patch 5: correctly catch data corruption during the MPTCP join
  selftest by marking tests as failed, instead of only printing a
  warning. A fix for v5.18.

- Patch 6: fix a leak with the userspace ADD_ADDR list in case of race
  condition during teardown. A fix for v5.19.

- Patch 7: deal with MPTFO with a valid token, but no data in the SYN. A
  fix for v6.2.

- Patch 8: reclaim forward-allocated memory in case of error on the
  receive side. A fix for v6.19.

Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
---
Changes in v2:
- Patches 1, 3, 6: new.
- Patch 2: handle MP_FASTCLOSE & DSS case.
- Patches 2, 4, 7: updated commit message to reply to AI reviews.
- Patch 8: start comment on the same line as the opening /*.
- Note: the title of this series has not been updated: the fixes are
  obviously for the next RC.
- Also, apart from patch 3, the different fixes are independent: in case
  of new issues discovered at review time, valid fixes can already been
  picked up, not to be blocked by unrelated patches.
- Link to v1: https://patch.msgid.link/20260728-net-mptcp-misc-fixes-7-2-rc6-v1-0-f7e2d229159d@kernel.org

---
Gang Yan (1):
      selftests: mptcp: join: mark tests with data corruption as failed

Matthieu Baerts (NGI0) (3):
      mptcp: options: reset DSS fields in case of unexpected size
      mptcp: avoid combining some incoming suboptions
      mptcp: remove MPC && MPJ check

Paolo Abeni (1):
      mptcp: reclaim forward-allocated memory on RX path errors

Qing Luo (1):
      mptcp: pm: fix data race in add_addr timer callback

Shardul Bankar (1):
      mptcp: pm: fix memory leak from alloc-during-teardown race

Wyatt Feng (1):
      mptcp: fastopen: only mark MPTFO subflows with SYN data

 net/mptcp/fastopen.c                            |  7 +--
 net/mptcp/options.c                             | 67 ++++++++++++++++++++++++-
 net/mptcp/pm.c                                  | 19 +++++--
 net/mptcp/pm_userspace.c                        |  4 ++
 net/mptcp/protocol.c                            |  6 +++
 net/mptcp/protocol.h                            |  8 +--
 net/mptcp/subflow.c                             |  5 --
 tools/testing/selftests/net/mptcp/mptcp_join.sh |  4 +-
 8 files changed, 101 insertions(+), 19 deletions(-)
---
base-commit: af39eb111ce6b5eba9c08513b62c4868eb7e7fd5
change-id: 20260728-net-mptcp-misc-fixes-7-2-rc6-22213c66ef75

Best regards,
--  
Matthieu Baerts (NGI0) <[email protected]>