Skip to content

Commit a24af86

Browse files
mrpreKernel Patches Daemon
authored andcommitted
net,mptcp: fix proto fallback detection with BPF
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() syn_recv_sock()/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 ''' 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_syn_recv_sock() subflow_ulp_fallback() subflow_drop_ctx() mptcp_subflow_ops_undo_override() ''' Then, this subflow can be normally used by sockmap, which replaces the native sk_prot with sockmap's custom sk_prot. The issue occurs when the user executes accept::mptcp_stream_accept::mptcp_fallback_tcp_ops(). Here, it uses sk->sk_prot to compare with the native sk_prot, but this is incorrect when sockmap is used, as we may incorrectly set sk->sk_socket->ops. This fix uses the more generic sk_family for the comparison instead. Additionally, this also prevents a WARNING from occurring: result from ./scripts/decode_stacktrace.sh: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 337 at net/mptcp/protocol.c:68 mptcp_stream_accept \ (net/mptcp/protocol.c:4005) Modules linked in: ... PKRU: 55555554 Call Trace: <TASK> do_accept (net/socket.c:1989) __sys_accept4 (net/socket.c:2028 net/socket.c:2057) __x64_sys_accept (net/socket.c:2067) x64_sys_call (arch/x86/entry/syscall_64.c:41) do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) RIP: 0033:0x7f87ac92b83d ---[ end trace 0000000000000000 ]--- Fixes: cec37a6 ("mptcp: Handle MP_CAPABLE options for outgoing connections") Cc: <[email protected]> Signed-off-by: Jiayuan Chen <[email protected]> Reviewed-by: Jakub Sitnicki <[email protected]> Reviewed-by: Matthieu Baerts (NGI0) <[email protected]>
1 parent f893b74 commit a24af86

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

net/mptcp/protocol.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ static u64 mptcp_wnd_end(const struct mptcp_sock *msk)
6161

6262
static const struct proto_ops *mptcp_fallback_tcp_ops(const struct sock *sk)
6363
{
64+
unsigned short family = READ_ONCE(sk->sk_family);
65+
6466
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
65-
if (sk->sk_prot == &tcpv6_prot)
67+
if (family == AF_INET6)
6668
return &inet6_stream_ops;
6769
#endif
68-
WARN_ON_ONCE(sk->sk_prot != &tcp_prot);
70+
WARN_ON_ONCE(family != AF_INET);
6971
return &inet_stream_ops;
7072
}
7173

0 commit comments

Comments
 (0)