Skip to content

mptcp: reject invalid mp_join requests right away

Florian Westphal linux-security-module mptcp netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3security: add const qualifier to struct sock in various placesinclude/linux/lsm_audit.h include/linux/lsm_hook_defs.h include/linux/security.h +7 more+15 -153 replies
2/3tcp: merge 'init_req' and 'route_req' functionsinclude/net/tcp.h net/ipv4/tcp_input.c net/ipv4/tcp_ipv4.c +2 more+44 -280 replies
3/3mptcp: emit tcp reset when a join request failsnet/mptcp/subflow.c+36 -111 reply

Reviews trailers per patch

2 of 3 patches have a Reviewed-by or Acked-by.

PatchMat MartineauJames Morris
1/3A-b
2/3
3/3R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net-next 0/3] mptcp: reject invalid mp_join requests right away

At the moment MPTCP can detect an invalid join request (invalid token, max number of subflows reached, and so on) right away but cannot reject the connection until the 3WHS has completed.
Instead the connection will complete and the subflow is reset afterwards.

To send the reset most information is already available, but we don't have good spot where the reset could be sent:

1. The ->init_req callback is too early and also doesn't allow to return an error that could be used to inform the TCP stack that the SYN should be dropped.

2. The ->route_req callback lacks the skb needed to send a reset.

3. The ->send_synack callback is the best fit from the available hooks, but its called after the request socket has been inserted into the queue already. This means we'd have to remove it again right away.

From a technical point of view, the second hook would be best:
1. Its before insertion into listener queue.
2. If it returns NULL TCP will drop the packet for us.

Problem is that we'd have to pass the skb to the function just for MPTCP.

Paolo suggested to merge init_req and route_req callbacks instead:
This makes all info available to MPTCP -- a return value of NULL drops the packet and MPTCP can send the reset if needed.

Because 'route_req' has a 'const struct sock *', this means either removal of const qualifier, or a bit of code churn to pass 'const' in security land.

This does the latter; I did not find any spots that need write access to struct sock.

To recap, the two alternatives are:
1. Solve it entirely in MPTCP: use the ->send_synack callback to unlink the request socket from the listener & drop it.
2. Avoid 'security' churn by removing the const qualifier.