Skip to content

Commit b8ab8cb

Browse files
mrpreKernel Patches Daemon
authored andcommitted
mptcp: disallow MPTCP subflows from sockmap
The sockmap feature allows bpf syscall from userspace, or based on bpf sockops, replacing the sk_prot of sockets during protocol stack processing with sockmap's custom read/write interfaces. ''' tcp_rcv_state_process() subflow_syn_recv_sock() tcp_init_transfer(BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB) bpf_skops_established <== sockops bpf_sock_map_update(sk) <== call bpf helper tcp_bpf_update_proto() <== update sk_prot ''' Consider two scenarios: 1. When the server has MPTCP enabled and the client also requests MPTCP, the sk passed to the BPF program is a subflow sk. Since subflows only handle partial data, replacing their sk_prot is meaningless and will cause traffic disruption. 2. When the server has MPTCP enabled but the client sends a TCP SYN without MPTCP, subflow_syn_recv_sock() performs a fallback on the subflow, replacing the subflow sk's sk_prot with the native sk_prot. ''' subflow_ulp_fallback() subflow_drop_ctx() mptcp_subflow_ops_undo_override() ''' Subsequently, accept::mptcp_stream_accept::mptcp_fallback_tcp_ops() converts the subflow to plain TCP. For the first case, we should prevent it from being combined with sockmap by setting sk_prot->psock_update_sk_prot to NULL, which will be blocked by sockmap's own flow. For the second case, since subflow_syn_recv_sock() has already restored sk_prot to native tcp_prot/tcpv6_prot, no further action is needed. Fixes: cec37a6 ("mptcp: Handle MP_CAPABLE options for outgoing connections") Cc: <[email protected]> Signed-off-by: Jiayuan Chen <[email protected]> Reviewed-by: Matthieu Baerts (NGI0) <[email protected]>
1 parent 4eb9670 commit b8ab8cb

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

net/mptcp/subflow.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2144,6 +2144,10 @@ void __init mptcp_subflow_init(void)
21442144
tcp_prot_override = tcp_prot;
21452145
tcp_prot_override.release_cb = tcp_release_cb_override;
21462146
tcp_prot_override.diag_destroy = tcp_abort_override;
2147+
#ifdef CONFIG_BPF_SYSCALL
2148+
/* Disable sockmap processing for subflows */
2149+
tcp_prot_override.psock_update_sk_prot = NULL;
2150+
#endif
21472151

21482152
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
21492153
/* In struct mptcp_subflow_request_sock, we assume the TCP request sock
@@ -2180,6 +2184,10 @@ void __init mptcp_subflow_init(void)
21802184
tcpv6_prot_override = tcpv6_prot;
21812185
tcpv6_prot_override.release_cb = tcp_release_cb_override;
21822186
tcpv6_prot_override.diag_destroy = tcp_abort_override;
2187+
#ifdef CONFIG_BPF_SYSCALL
2188+
/* Disable sockmap processing for subflows */
2189+
tcpv6_prot_override.psock_update_sk_prot = NULL;
2190+
#endif
21832191
#endif
21842192

21852193
mptcp_diag_subflow_init(&subflow_ulp_ops);

0 commit comments

Comments
 (0)