TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: Support dual-stack sockets in bpf_tcp_check_syncookie

Browse Source 
[ Upstream commit 2e8702cc0c ]

bpf_tcp_gen_syncookie looks at the IP version in the IP header and
validates the address family of the socket. It supports IPv4 packets in
AF_INET6 dual-stack sockets.

On the other hand, bpf_tcp_check_syncookie looks only at the address
family of the socket, ignoring the real IP version in headers, and
validates only the packet size. This implementation has some drawbacks:

1. Packets are not validated properly, allowing a BPF program to trick
   bpf_tcp_check_syncookie into handling an IPv6 packet on an IPv4
   socket.

2. Dual-stack sockets fail the checks on IPv4 packets. IPv4 clients end
   up receiving a SYNACK with the cookie, but the following ACK gets
   dropped.

This patch fixes these issues by changing the checks in
bpf_tcp_check_syncookie to match the ones in bpf_tcp_gen_syncookie. IP
version from the header is taken into account, and it is validated
properly with address family.

Fixes: 3990408470 ("bpf: add helper to check for a valid SYN cookie")
Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Acked-by: Arthur Fabre <afabre@cloudflare.com>
Link: https://lore.kernel.org/bpf/20220406124113.2795730-1-maximmi@nvidia.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Maxim Mikityanskiy
2022-04-06 15:41:12 +03:00
committed by Greg Kroah-Hartman
parent 6c17f4ef3c
commit 970a6bb729
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/core/filter.c
+13 -4
View File
@@ -6492,24 +6492,33 @@ BPF_CALL_5(bpf_tcp_check_syncookie, struct sock *, sk, void *, iph, u32, iph_len
if (!th->ack || th->rst || th->syn) if (!th->ack || th->rst || th->syn)
return -ENOENT; return -ENOENT;
if (unlikely(iph_len < sizeof(struct iphdr)))
return -EINVAL;
if (tcp_synq_no_recent_overflow(sk)) if (tcp_synq_no_recent_overflow(sk))
return -ENOENT; return -ENOENT;
cookie = ntohl(th->ack_seq) - 1; cookie = ntohl(th->ack_seq) - 1;
switch (sk->sk_family) { /* Both struct iphdr and struct ipv6hdr have the version field at the
case AF_INET: * same offset so we can cast to the shorter header (struct iphdr).
if (unlikely(iph_len < sizeof(struct iphdr))) */
switch (((struct iphdr *)iph)->version) {
case 4:
if (sk->sk_family == AF_INET6 && ipv6_only_sock(sk))
return -EINVAL; return -EINVAL;
ret = __cookie_v4_check((struct iphdr *)iph, th, cookie); ret = __cookie_v4_check((struct iphdr *)iph, th, cookie);
break; break;
#if IS_BUILTIN(CONFIG_IPV6) #if IS_BUILTIN(CONFIG_IPV6)
case AF_INET6: case 6:
if (unlikely(iph_len < sizeof(struct ipv6hdr))) if (unlikely(iph_len < sizeof(struct ipv6hdr)))
return -EINVAL; return -EINVAL;
if (sk->sk_family != AF_INET6)
return -EINVAL;
ret = __cookie_v6_check((struct ipv6hdr *)iph, th, cookie); ret = __cookie_v6_check((struct ipv6hdr *)iph, th, cookie);
break; break;
#endif /* CONFIG_IPV6 */ #endif /* CONFIG_IPV6 */