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() on ignore_on_*" into main

Browse source
This commit is contained in:
Maciej Żenczykowski 2025-05-20 14:17:49 -07:00 • committed by Android (Google) Code Review
commit aeb8fcc185
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

@ -909,7 +909,7 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
ALOGD("skipping map %s which is ignored on %s builds", mapNames[i].c_str(),
getBuildType().c_str());
mapFds.push_back(unique_fd());
continue;
abort();
}
if ((isArm() && isKernel32Bit() && md[i].ignore_on_arm32) ||
@ -920,7 +920,7 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
ALOGD("skipping map %s which is ignored on %s", mapNames[i].c_str(),
describeArch());
mapFds.push_back(unique_fd());
continue;
abort();
}
enum bpf_map_type type = md[i].type;
@ -1182,7 +1182,7 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
(cs[i].prog_def->ignore_on_userdebug && isUserdebug())) {
ALOGD("cs[%d].name:%s is ignored on %s builds", i, name.c_str(),
getBuildType().c_str());
continue;
abort();
}
if ((isArm() && isKernel32Bit() && cs[i].prog_def->ignore_on_arm32) ||
@ -1191,7 +1191,7 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
(isX86() && isKernel64Bit() && cs[i].prog_def->ignore_on_x86_64) ||
(isRiscV() && cs[i].prog_def->ignore_on_riscv64)) {
ALOGD("cs[%d].name:%s is ignored on %s", i, name.c_str(), describeArch());
continue;
abort();
}
if (specified(selinux_context)) {