[0/2] mptcp: fix crash with mptcp-ulp on tcp sockets

Message

Florian Westphal Dec. 6, 2021, 3:51 p.m. UTC

While working on the tls-ULP syzbot report I found that its also
possible to set the "mptcp" ulp from userspace, iff the socket is a
tcp socket returned via accept() on an mptcp listen socket.

First patch fixes this, second patch adds a test case.

Florian Westphal (2):
  mptcp: clear 'kern' flag from fallback sockets
  selftests: mptcp: try to set mptcp ulp mode in different sk states

 net/mptcp/protocol.c                          |  1 +
 .../selftests/net/mptcp/mptcp_connect.c       | 97 ++++++++++---------
 .../selftests/net/mptcp/mptcp_connect.sh      | 20 ----
 3 files changed, 52 insertions(+), 66 deletions(-)

Comments

Matthieu Baerts Dec. 7, 2021, 1:57 p.m. UTC | #1

Hi Florian, Mat,

On 06/12/2021 16:51, Florian Westphal wrote:
> While working on the tls-ULP syzbot report I found that its also
> possible to set the "mptcp" ulp from userspace, iff the socket is a
> tcp socket returned via accept() on an mptcp listen socket.
> 
> First patch fixes this, second patch adds a test case.
>
> Florian Westphal (2):
>   mptcp: clear 'kern' flag from fallback sockets
>   selftests: mptcp: try to set mptcp ulp mode in different sk states

Thank you for the patches and the reviews!

- cf6bfb9af34f: mptcp: clear 'kern' flag from fallback sockets
 (v2)
- Results: 4be3d8d5b45c..23aff1c44f69

- 9a7f7dc671fc: selftests: mptcp: try to set mptcp ulp mode in different
sk states

- Results: 23aff1c44f69..1250e74665ba

Builds and tests are now in progress:



https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20211207T135708

https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export

Cheers,
Matt