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

bpf: rename 'progs' section to '.android_progs'

Browse source 
(this matches what we did for maps)

Test: TreeHugger
Flag: EXEMPT mainline
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2d75fb519f00471a6f1e6b0ffded9f327ecae7b4
This commit is contained in:
Maciej Żenczykowski 2025-08-04 14:57:56 -07:00
commit eb55711799
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bpf/loader/NetBpfLoad.cpp
View file

@ -402,10 +402,10 @@ int readCodeSections(ElfObject& elfObj, vector<codeSection>& cs) {
entries = shTable.size();
vector<struct bpf_prog_def> pd;
ret = elfObj.readSectionByName("progs", pd);
ret = elfObj.readSectionByName(".android_progs", pd);
if (ret) return ret;
vector<string> progDefNames;
ret = elfObj.getSectionSymNames("progs", progDefNames);
ret = elfObj.getSectionSymNames(".android_progs", progDefNames);
if (!pd.empty() && ret) return ret;
for (int i = 0; i < entries; i++) {

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

@ -535,7 +535,7 @@ static int (*bpf_trace_printk)(const char* fmt, int fmt_size, ...) = (void*) BPF
min_loader, max_loader, opt, selinux, pindir) \
VALIDATE_SELINUX_CONTEXT(min_loader, selinux); \
VALIDATE_PIN_DIR(min_loader, pindir); \
const struct bpf_prog_def SECTION("progs") the_prog##_def = { \
const struct bpf_prog_def SECTION(".android_progs") the_prog##_def = { \
.type = BPF_PROG_TYPE_##TYPE, \
.attach_type = BPF_PROG_ATTACH_TYPE_##TYPE, \
.uid = (prog_uid), \