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 loadProg()

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

9
bpf/loader/NetBpfLoad.cpp
View file

@ -1593,8 +1593,7 @@ static int loadProgByLibbpf(const char* const elfPath, const unsigned int bpfloa
return 0;
}
int loadProg(const char* const elfPath, const unsigned int bpfloader_ver,
const char* const prefix) {
int loadProg(const char* const elfPath, const unsigned int bpfloader_ver) {
vector<char> license;
vector<codeSection> cs;
vector<unique_fd> mapFds;
@ -1614,7 +1613,7 @@ int loadProg(const char* const elfPath, const unsigned int bpfloader_ver,
ALOGD("BpfLoader ver 0x%05x processing ELF object %s", bpfloader_ver, elfPath);
ret = createMaps(elfPath, elfFile, mapFds, prefix, bpfloader_ver);
ret = createMaps(elfPath, elfFile, mapFds, "", bpfloader_ver);
if (ret) {
ALOGE("Failed to create maps: (ret=%d) in %s", ret, elfPath);
return ret;
@ -1632,7 +1631,7 @@ int loadProg(const char* const elfPath, const unsigned int bpfloader_ver,
applyMapRelo(elfFile, mapFds, cs);
ret = loadCodeSections(elfPath, cs, string(license.data()), prefix, bpfloader_ver);
ret = loadCodeSections(elfPath, cs, string(license.data()), "", bpfloader_ver);
if (ret) ALOGE("Failed to load programs, loadCodeSections ret=%d", ret);
return ret;
@ -1653,7 +1652,7 @@ static int loadObject(const unsigned int bpfloader_ver,
const char* const fname, const bool useLibbpf = false) {
string progPath = string(BPFROOT) + fname;
int ret = useLibbpf ? loadProgByLibbpf(progPath.c_str(), bpfloader_ver) :
loadProg(progPath.c_str(), bpfloader_ver, "");
loadProg(progPath.c_str(), bpfloader_ver);
if (ret) {
ALOGE("Failed to load object: %s, ret: %s, libbpf: %d",
progPath.c_str(), std::strerror(-ret), useLibbpf);