commit aa897a5ae8946ffac9be3114f98decbd3d6ccb6d
author Ken Chen <cken@google.com> Wed Feb 09 10:23:34 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 09 10:23:34 2022 +0000
tree 98de31aad475306ffbcfcfb257cdf2cec18de2b2
parent a512093d68ed6fc407f72a3c693f4837e05af365
parent 851d2d85089b072a6ad9d4dfddad003da882da6b

Merge "Change gid of cgroupskb/<ingress|egress>/stats" am: d04a1ef466 am: 33f83598ad am: 851d2d8508

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

Change-Id: I05222b71bad615c554e5e0b4606926c844a84dd4

bpf_progs/netd.c

diff --git a/bpf_progs/netd.c b/bpf_progs/netd.c
index c1a74e7..8d05757 100644
--- a/bpf_progs/netd.c
+++ b/bpf_progs/netd.c
@@ -297,12 +297,12 @@
     return match;
 }
 
-DEFINE_BPF_PROG("cgroupskb/ingress/stats", AID_ROOT, AID_ROOT, bpf_cgroup_ingress)
+DEFINE_BPF_PROG("cgroupskb/ingress/stats", AID_ROOT, AID_SYSTEM, bpf_cgroup_ingress)
 (struct __sk_buff* skb) {
     return bpf_traffic_account(skb, BPF_INGRESS);
 }
 
-DEFINE_BPF_PROG("cgroupskb/egress/stats", AID_ROOT, AID_ROOT, bpf_cgroup_egress)
+DEFINE_BPF_PROG("cgroupskb/egress/stats", AID_ROOT, AID_SYSTEM, bpf_cgroup_egress)
 (struct __sk_buff* skb) {
     return bpf_traffic_account(skb, BPF_EGRESS);
 }