[PATCH net v2 00/11] mptcp: misc fixes for v7.1-rc7
From: Matthieu Baerts (NGI0)
Date: Tue Jun 02 2026 - 08:19:46 EST
Here are various unrelated fixes:
- Patch 1: fix missing wakeups when multiple threads are reading from
the same fd. A fix for v5.7.
- Patch 2: fix retransmission loop when MPTCP checksum is enabled. A fix
for v5.14.
- Patch 3: fix a TOCTOU race while computing rcv_wnd. A fix for v5.11.
- Patch 4: allow subflows receive window to shrink if needed. A fix for
v5.19.
- Patches 5-6: avoid 'extra_subflows' to underflow with the userspace
PM. A fix for v5.19.
- Patch 7: report errors if one subflow cannot set SO_TIMESTAMPING. A
fix for v5.14.
- Patch 8: try to set TCP_MAXSEG on all subflows, before reporting
errors, if any. A fix for v6.17.
- Patch 9: check desc->count in read_sock, to act as expected. A fix
for v7.0.
- Patch 10: fix an uninit value in mptcp_established_options, reported
by syzbot. A fix for v7.1-rc1.
- Patch 11: fix a similar issue than the previous patch, exposed by the
same modification from v7.1-rc1, but was already causing issues since
v5.15.
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
---
Changes in v2:
- Drop former patch 9
- Patch 3: add a missing 's' in a comment (NIPA AI)
- Patches 10-11: new
- Link to v1: https://patch.msgid.link/20260601-net-mptcp-misc-fixes-7-1-rc7-v1-0-a5ae7791754b@xxxxxxxxxx
---
Gang Yan (1):
mptcp: check desc->count in read_sock
Matthieu Baerts (NGI0) (3):
mptcp: sockopt: check timestamping ret value
mptcp: sockopt: set sockopt on all subflows
mptcp: add-addr: always drop other suboptions
Paolo Abeni (5):
mptcp: fix missing wakeups in edge scenarios
mptcp: fix retransmission loop when csum is enabled
mptcp: close TOCTOU race while computing rcv_wnd
mptcp: allow subflow rcv wnd to shrink
mptcp: fix uninit-value in mptcp_established_options
Tao Cui (2):
mptcp: pm: fix extra_subflows underflow on userspace PM subflow creation
selftests: mptcp: add test for extra_subflows underflow on userspace PM
include/net/mptcp.h | 7 ++-
net/mptcp/options.c | 79 ++++++++++++-------------
net/mptcp/pm.c | 15 ++---
net/mptcp/pm_userspace.c | 14 +++--
net/mptcp/protocol.c | 10 ++++
net/mptcp/protocol.h | 7 +--
net/mptcp/sockopt.c | 15 +++--
tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++
8 files changed, 81 insertions(+), 70 deletions(-)
---
base-commit: 3522b21fd7e1863d0734537737bd59f1b90d0190
change-id: 20260531-net-mptcp-misc-fixes-7-1-rc7-34884c9b246d
Best regards,
--
Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>