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 "NetBpfLoad: abort if pin_subdir is specified" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-05-20 14:17:43 -07:00 • committed by Android (Google) Code Review
commit 2be0eec88c
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bpf/loader/NetBpfLoad.cpp
View file

@ -970,6 +970,7 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
if (specified(pin_subdir)) {
ALOGV("map %s pin_subdir [%-32s] -> %d -> '%s'", mapNames[i].c_str(), md[i].pin_subdir,
static_cast<int>(pin_subdir), lookupPinSubdir(pin_subdir));
abort();
}
// Format of pin location is /sys/fs/bpf/<pin_subdir|prefix>map_<objName>_<mapName>
@ -1203,6 +1204,7 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
ALOGV("prog %s pin_subdir [%-32s] -> %d -> '%s'", name.c_str(),
cs[i].prog_def->pin_subdir, static_cast<int>(pin_subdir),
lookupPinSubdir(pin_subdir));
abort();
}
// strip any potential $foo suffix