Skip to content

mptcp: fix incoming options parsing

Paolo Abeni mptcp netdev 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 1 replyIn review
  2. v15 patches 3 repliesSuperseded

Changes in v2 from the cover letter

- cleaned-up patch 1/5
- rebased on top of current -net

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5mptcp: consolidate synack processing.include/net/mptcp.h net/ipv4/tcp_input.c net/mptcp/options.c +1 more+24 -290 replies
2/5mptcp: move option parsing into mptcp_incoming_options()include/linux/tcp.h include/net/mptcp.h net/ipv4/tcp_input.c +4 more+115 -1220 replies
3/5mptcp: avoid a WARN on bad input.net/mptcp/options.c+2 -20 replies
4/5mptcp: fix 'use_ack' option access.net/mptcp/options.c+1 -10 replies
5/5mptcp: initialize the data_fin field for mpc packetsnet/mptcp/options.c+1 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH net v2 0/5] mptcp: fix incoming options parsing

This series addresses a serious issue in MPTCP option parsing.

This is bigger than the usual -net change, but I was unable to find a working, sane, smaller fix.

The core change is inside patch 2/5 which moved MPTCP options parsing from the TCP code inside existing MPTCP hooks and clean MPTCP options status on each processed packet.

The patch 1/5 is a needed pre-requisite, and patches 3,4,5 are smaller, related fixes.

v1 -> v2:
- cleaned-up patch 1/5
- rebased on top of current -net

Paolo Abeni (5):
mptcp: consolidate synack processing.
mptcp: move option parsing into mptcp_incoming_options()
mptcp: avoid a WARN on bad input.
mptcp: fix 'use_ack' option access.
mptcp: initialize the data_fin field for mpc packets

 include/linux/tcp.h  | 51 ------------------------
 include/net/mptcp.h  |  3 --
 net/ipv4/tcp_input.c |  7 ----
 net/mptcp/options.c  | 95 +++++++++++++++++++-------------------------
 net/mptcp/protocol.c |  6 +--
 net/mptcp/protocol.h | 43 +++++++++++++++++++-
 net/mptcp/subflow.c  | 82 ++++++++++++++++++++++++--------------
 7 files changed, 138 insertions(+), 149 deletions(-)
Signature · 1 line
2.21.1