joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes I35cf433a,I1ac99c20 into main

Browse source 
* changes:
  bpf: remove BPFLOADER_MIN_VER check on BPF_MAP_UID
  bpf_helpers: require DEFAULT_BPF_PIN_SUBDIR to be defined
This commit is contained in:
Treehugger Robot 2025-07-30 03:01:32 -07:00 • committed by Android (Google) Code Review
commit 4a7a708fc5
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bpf/progs/include/bpf_helpers.h
View file

@ -368,13 +368,11 @@ static int (*bpf_sk_storage_delete_unsafe) (const void* sk_storage,
#endif
#ifndef DEFAULT_BPF_PIN_SUBDIR
#define DEFAULT_BPF_PIN_SUBDIR ""
#error "Must define DEFAULT_BPF_PIN_SUBDIR"
#endif
#ifndef DEFAULT_BPF_MAP_UID
#define DEFAULT_BPF_MAP_UID AID_ROOT
#elif BPFLOADER_MIN_VER < 28u
#error "Bpf Map UID must be left at default of AID_ROOT for BpfLoader prior to v0.28"
#endif
// for maps not meant to be accessed from userspace