[PATCH 5.15.y 0/6] mptcp: fix recent failed backports

["Matthieu Baerts (NGI0)" <matttbe@kernel.org>]

Greg recently reported 6 patches that could not be applied without
conflicts in v5.15:

 - e32d262c89e2 ("mptcp: handle consistently DSS corruption")
 - 4dabcdf58121 ("tcp: fix mptcp DSS corruption due to large pmtu xmit")
 - 119d51e225fe ("mptcp: fallback when MPTCP opts are dropped after 1st
   data")
 - 7decd1f5904a ("mptcp: pm: fix UaF read in mptcp_pm_nl_rm_addr_or_subflow")
 - 3d041393ea8c ("mptcp: prevent MPC handshake on port-based signal
   endpoints")
 - 5afca7e996c4 ("selftests: mptcp: join: test for prohibited MPC to
   port-based endp")

Conflicts have been resolved for the 5 first ones, and documented in
each patch.

The last patch has not been backported: this is an extra test for the
selftests validating the previous commit, and there are a lot of
conflicts. That's fine not to backport this test, it is still possible
to use the selftests from a newer version and run them on this older
kernel.

One extra commit has been backported, to support allow_infinite_fallback
which is used by two commits from the list above:

 - 0530020a7c8f ("mptcp: track and update contiguous data status")

Geliang Tang (1):
  mptcp: track and update contiguous data status

Matthieu Baerts (NGI0) (2):
  mptcp: fallback when MPTCP opts are dropped after 1st data
  mptcp: pm: fix UaF read in mptcp_pm_nl_rm_addr_or_subflow

Paolo Abeni (3):
  mptcp: handle consistently DSS corruption
  tcp: fix mptcp DSS corruption due to large pmtu xmit
  mptcp: prevent MPC handshake on port-based signal endpoints

 net/ipv4/tcp_output.c  |  2 +-
 net/mptcp/mib.c        |  3 +++
 net/mptcp/mib.h        |  3 +++
 net/mptcp/pm_netlink.c |  3 ++-
 net/mptcp/protocol.c   | 23 ++++++++++++++++++++---
 net/mptcp/protocol.h   |  2 ++
 net/mptcp/subflow.c    | 19 ++++++++++++++++---
 7 files changed, 47 insertions(+), 8 deletions(-)

-- 
2.45.2