bpf: fix out-of-bounds read in __bpf_skc_lookup
Subsystems (4)
PATCH 1/1 bpf: fix out-of-bounds read in __bpf_skc_lookup
__bpf_skc_lookup takes a socket tuple and the length of the tuple as an argument. Based on the length, it decides which address family to pass to the helper function sk_lookup.
In case of AF_INET6, it fails to verify that the length of the tuple is long enough. sk_lookup may therefore access data past the end of the tuple.
Fixes 6acc9b432e67 ("bpf: Add helper to retrieve socket in BPF")
Signed-off-by Lorenz Bauer <[email protected]>
--- net/core/filter.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/core/filter.c +7 -1
@@ -5304,7 +5304,13 @@ __bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,struct net *net;int sdif; - family = len ==sizeof (tuple->ipv4) ?AF_INET :AF_INET6 ; +if (len ==sizeof (tuple->ipv4)) + family =AF_INET ; +else if (len ==sizeof (tuple->ipv6)) + family =AF_INET6 ; +else +return NULL ; +if (unlikely (family ==AF_UNSPEC || flags || !((s32 )netns_id <0 || netns_id <=S32_MAX ))) goto out;
Signature · 1 line
2.19.1
Quoted 10 lines · Lorenz Bauer
__bpf_skc_lookuptakes a socket tuple and the length of the tuple as an argument. Based on the length, it decides which address family to pass to the helper functionsk_lookup.In case of
AF_INET6, it fails to verify that the length of the tuple is long enough.sk_lookupmay therefore access data past the end of the tuple.Fixes 6acc9b432e67 ("bpf: Add helper to retrieve socket in BPF")Signed-off-by Lorenz Bauer <[email protected]>
Applied, thanks!