commit b92b7cab44b6efe6ed60f524b45e9a699a3e8e24
author Maciej Żenczykowski <maze@google.com> Fri Mar 03 17:56:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 03 17:56:36 2023 +0000
tree 2d528cfff56b16bb150b5310d739c463b596fbc1
parent cc779fbd3155a7bc19a9cf634b63a58ae9731c99
parent 896ef4e01b9bb459519593887a4359d9ed533492

Merge "bpf netd - minor perf improvement - move uid check first" am: 896ef4e01b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2465213

Change-Id: I9168d20e35ba81b2705486144c1f2f1e9c54e3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bpf_progs/netd.c

diff --git a/bpf_progs/netd.c b/bpf_progs/netd.c
index cb0da19..e068d8a 100644
--- a/bpf_progs/netd.c
+++ b/bpf_progs/netd.c
@@ -350,10 +350,10 @@
 
 static __always_inline inline int bpf_owner_match(struct __sk_buff* skb, uint32_t uid,
                                                   bool egress, const unsigned kver) {
-    if (skip_owner_match(skb, kver)) return PASS;
-
     if (is_system_uid(uid)) return PASS;
 
+    if (skip_owner_match(skb, kver)) return PASS;
+
     BpfConfig enabledRules = getConfig(UID_RULES_CONFIGURATION_KEY);
 
     UidOwnerValue* uidEntry = bpf_uid_owner_map_lookup_elem(&uid);