]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: Fix IPv6 dport byte order in bpf_sk_lookup_udp
authorAndrey Ignatov <rdna@fb.com>
Fri, 9 Nov 2018 18:54:00 +0000 (10:54 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 17 Nov 2018 01:54:29 +0000 (17:54 -0800)
commitcac6cc2f5ac710334ae0f6bba5630d791c253574
tree387ef8aa2c9b1bed40cd0618bddd212ce51c819f
parentac8acec9912a93be9953446766e0bb73aeeecc64
bpf: Fix IPv6 dport byte order in bpf_sk_lookup_udp

Lookup functions in sk_lookup have different expectations about byte
order of provided arguments.

Specifically __inet_lookup, __udp4_lib_lookup and __udp6_lib_lookup
expect dport to be in network byte order and do ntohs(dport) internally.

At the same time __inet6_lookup expects dport to be in host byte order
and correspondingly name the argument hnum.

sk_lookup works correctly with __inet_lookup, __udp4_lib_lookup and
__inet6_lookup with regard to dport. But in __udp6_lib_lookup case it
uses host instead of expected network byte order. It makes result
returned by bpf_sk_lookup_udp for IPv6 incorrect.

The patch fixes byte order of dport passed to __udp6_lib_lookup.

Originally sk_lookup properly handled UDPv6, but not TCPv6. 5ef0ae84f02a
fixes TCPv6 but breaks UDPv6.

Fixes: 5ef0ae84f02a ("bpf: Fix IPv6 dport byte-order in bpf_sk_lookup")
Signed-off-by: Andrey Ignatov <rdna@fb.com>
Acked-by: Joe Stringer <joe@wand.net.nz>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
net/core/filter.c