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

NetBpfLoad: remove 'prefix' from lookupPinSubDir()

Browse source 
Test: TreeHugger
Flag: EXEMPT mainline/noop
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ief8e0d44efc5b1bc235ba70d78875c0ef0e9ed76
This commit is contained in:
Maciej Żenczykowski 2025-07-28 15:32:09 -07:00
commit 16a2448bd8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bpf/loader/NetBpfLoad.cpp
View file

@ -172,9 +172,9 @@ domain getDomainFromSelinuxContext(const char s[BPF_PIN_SUBDIR_CHAR_ARRAY_SIZE])
abort();
}
constexpr const char* lookupPinSubdir(const domain d, const char* const unspecified = "") {
constexpr const char* lookupPinSubdir(const domain d) {
switch (d) {
case domain::unspecified: return unspecified;
case domain::unspecified: return "";
case domain::tethering: return "tethering/";
case domain::net_private: return "net_private/";
case domain::net_shared: return "net_shared/";
@ -983,7 +983,7 @@ static enum bpf_map_type sanitizeMapType(enum bpf_map_type type) {
static string buildMapPinLoc(const domain pin_subdir, const string& objName, const string& mapName) {
// Format of pin location is /sys/fs/bpf/<pin_subdir|prefix>map_<objName>_<mapName>
// Note: <objName> refers to the extension-less basename of the .o file (without @ suffix).
return string(BPF_FS_PATH) + lookupPinSubdir(pin_subdir, "") + "map_" +
return string(BPF_FS_PATH) + lookupPinSubdir(pin_subdir) + "map_" +
objName + "_" + mapName;
}
@ -1268,7 +1268,7 @@ static int validateProg(const borrowed_fd& fd, string& progPinLoc,
static string buildProgPinLoc(const domain pin_subdir, const string& objName, const string& name) {
// Format of pin location is
// /sys/fs/bpf/<prefix>prog_<objName>_<progName>
return string(BPF_FS_PATH) + lookupPinSubdir(pin_subdir, "") + "prog_" +
return string(BPF_FS_PATH) + lookupPinSubdir(pin_subdir) + "prog_" +
objName + '_' + string(name);
}