From dd8ee1e63de2391a92c9fabae32edb686018783e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 21 Jan 2025 15:41:54 -0800 Subject: [PATCH] bpf netd: hardcode AID_ROOT/AID_NET_ADMIN in DEFINE_SYS_BPF_PROG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (no other value makes sense anyway) Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I032c8d9355fd18f1d656eb6b0c2942b965bbab2c --- bpf/progs/netd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bpf/progs/netd.c b/bpf/progs/netd.c index feebd3b838..b3c385fc2a 100644 --- a/bpf/progs/netd.c +++ b/bpf/progs/netd.c @@ -133,8 +133,8 @@ DEFINE_BPF_MAP_RO_NETD(data_saver_enabled_map, ARRAY, uint32_t, bool, "fs_bpf_netd_readonly", "", LOAD_ON_ENG, LOAD_ON_USER, LOAD_ON_USERDEBUG) // programs that only need to be usable by the system server -#define DEFINE_SYS_BPF_PROG(SECTION_NAME, prog_uid, prog_gid, the_prog) \ - DEFINE_BPF_PROG_EXT(SECTION_NAME, prog_uid, prog_gid, the_prog, KVER_NONE, KVER_INF, \ +#define DEFINE_SYS_BPF_PROG(SECTION_NAME, the_prog) \ + DEFINE_BPF_PROG_EXT(SECTION_NAME, AID_ROOT, AID_NET_ADMIN, the_prog, KVER_NONE, KVER_INF, \ BPFLOADER_MIN_VER, BPFLOADER_MAX_VER, MANDATORY, \ "fs_bpf_net_shared", "", LOAD_ON_ENG, LOAD_ON_USER, LOAD_ON_USERDEBUG) @@ -590,7 +590,7 @@ DEFINE_XTBPF_PROG("skfilter/ingress/xtbpf", xt_bpf_ingress_prog) return XTBPF_MATCH; } -DEFINE_SYS_BPF_PROG("schedact/ingress/account", AID_ROOT, AID_NET_ADMIN, +DEFINE_SYS_BPF_PROG("schedact/ingress/account", tc_bpf_ingress_account_prog) (struct __sk_buff* skb) { if (is_received_skb(skb)) {