| Message ID | 20220630082618.15649-1-tklauser@distanz.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2064a132c0de3426d5ba43023200994e0c77e652 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] bpf: omit superfluous address family check in __bpf_skc_lookup | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <daniel@iogearbox.net>: On Thu, 30 Jun 2022 10:26:18 +0200 you wrote: > family is only set to either AF_INET or AF_INET6 based on len. In all > other cases we return early. Thus the check against AF_UNSPEC can be > omitted. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > --- > net/core/filter.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Here is the summary with links: - [bpf-next] bpf: omit superfluous address family check in __bpf_skc_lookup https://git.kernel.org/bpf/bpf-next/c/2064a132c0de You are awesome, thank you!
diff --git a/net/core/filter.c b/net/core/filter.c index c6941ab0eb52..4fae91984359 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6516,8 +6516,8 @@ __bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len, u64 flags) { struct sock *sk = NULL; - u8 family = AF_UNSPEC; struct net *net; + u8 family; int sdif; if (len == sizeof(tuple->ipv4)) @@ -6527,8 +6527,7 @@ __bpf_skc_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len, else return NULL; - if (unlikely(family == AF_UNSPEC || flags || - !((s32)netns_id < 0 || netns_id <= S32_MAX))) + if (unlikely(flags || !((s32)netns_id < 0 || netns_id <= S32_MAX))) goto out; if (family == AF_INET)
family is only set to either AF_INET or AF_INET6 based on len. In all other cases we return early. Thus the check against AF_UNSPEC can be omitted. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- net/core/filter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)