[PATCH net v2 00/15] mptcp: misc fixes for v7.3-rc1
From: Matthieu Baerts (NGI0)
Date: Tue Sep 08 2026 - 12:37:33 EST
Here are various unrelated fixes:
- Patch 1: Do not reschedule the RTX timer for sockets that fell back to
TCP. A fix for v5.7.
- Patch 2: Avoid copying thmac which will not be used and could be
uninitialised. A fix for v5.7.
- Patch 3: Re-set the request backup flag when SYN cookies are used. A
fix for v5.9.
- Patch 4: Drop pending ADD_ADDR when removing ID0, and avoid a WARN. A
fix for v5.13.
- Patch 5: Handle invalid suboptions where the checksum is requested in
the MP_CAPABLE 4th ACK with data, but not added in the option. A fix
for v5.14.
- Patch 6: Prevent a race between mptcp_disconnect() and the retransmit
timer. A fix for v5.17.
- Patch 7: Fix a use-after-free in the selftests that could lead to
false positive. A fix for v5.17.
- Patch 8: Limit new addresses with the userspace PM to avoid an address
ID overflow. A fix for v5.19.
- Patch 9: Reset the ADD_ADDR retransmission counter when the timer is
reused. A fix for v5.19.
- Patch 10: Remove unneeded and confusing READ_ONCE() annotations. A fix
for v6.13.
- Patches 11-12: Get nstat counters for the current test, not since the
creation of the netns. A fix for v6.19.
- Patch 13: Fix an uninit-value in mptcp_write_data_fin for a corner
case now that only a part of the tcp_out_options struct is reset. A
fix for v7.1.
- Patches 14-15: Two follow-up patches addressing minor comments
discovered after the human review. A fix for v7.3-rc1.
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
---
Changes in v2:
- Patch 1: Invert RTX disabled/enabled logic to catch more cases.
- Patch 2: Note for Sashiko's false positive.
- Patch 3: Update Fixes tag.
- Patch 4: Fix new helpers name + note.
- Patch 5: Note for Clashiko.
- Patch 6: New, addressing a previous comment from Clashiko.
- Patch 10: Remove Cc stable.
- Note: I guess I should stop mentioning the version target: because of
Clashiko's reviews delaying the fixes, it is hard to predict it.
- Link to v1: https://patch.msgid.link/20260824-net-mptcp-misc-fixes-7-3-rc1-v1-0-a92309d121ca@xxxxxxxxxx
---
Gang Yan (1):
selftests: mptcp: fix an UAF in mptcp_connect.c
Kalpan Jani (1):
mptcp: pm: kernel: drop pending ADD_ADDR when removing ID0
Matthieu Baerts (NGI0) (7):
mptcp: subflow: no need to copy thmac during ulp_clone
mptcp: syncookies: remember the request backup flag
mptcp: options: handle MPC data + csum reqd + no csum
mptcp: pm: reset retrans_time when ADD_ADDR entry is reused
selftests: mptcp: lib: dump nstat for the right test
selftests: mptcp: lib: get counters for the right test
mptcp: options: fix uninit-value in mptcp_write_data_fin
Paolo Abeni (5):
mptcp: do not reschedule the RTX timer for fallback sockets
mptcp: prevent race between disconnect() and rtx
mptcp: remove unneeded READ_ONCE() annotation
mptcp: being below memory limit is a likely() condition
mptcp: avoid pruning for OoW data
Qing Luo (1):
mptcp: pm: userspace: fix address ID overflow
net/mptcp/options.c | 8 +++--
net/mptcp/pm.c | 2 +-
net/mptcp/pm_kernel.c | 8 +++++
net/mptcp/pm_userspace.c | 18 +++++++---
net/mptcp/protocol.c | 41 +++++++++++++++--------
net/mptcp/protocol.h | 1 +
net/mptcp/subflow.c | 1 -
net/mptcp/syncookies.c | 5 ++-
tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++-
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 26 ++++++++------
10 files changed, 78 insertions(+), 36 deletions(-)
---
base-commit: e0554c6276da957b6e72849520c70a97404cd1ae
change-id: 20260824-net-mptcp-misc-fixes-7-3-rc1-6a4d6223ec41
Best regards,
--
Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>