From 05da6b077d20009452473885852dd223286b3ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Mon, 28 Jul 2025 15:34:43 -0700 Subject: [PATCH] NetBpfload: remove 'prefix' from loadCodeSections() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: TreeHugger Flag: EXEMPT mainline/noop Signed-off-by: Maciej Żenczykowski Change-Id: Id591a6cc621e8c0db52ac8df694d139cd273853a --- bpf/loader/NetBpfLoad.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index f42689b075..f492b154d2 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1274,7 +1274,7 @@ static string buildProgPinLoc(const domain pin_subdir, const char* prefix, } static int loadCodeSections(const char* elfPath, vector& cs, const string& license, - const char* prefix, const unsigned int bpfloader_ver) { + const unsigned int bpfloader_ver) { unsigned kvers = kernelVersion(); if (!kvers) { @@ -1322,7 +1322,7 @@ static int loadCodeSections(const char* elfPath, vector& cs, const name = name.substr(0, name.find_last_of('$')); bool reuse = false; - string progPinLoc = buildProgPinLoc(pin_subdir, prefix, objName, name); + string progPinLoc = buildProgPinLoc(pin_subdir, "", objName, name); if (access(progPinLoc.c_str(), F_OK) == 0) { fd.reset(retrieveProgram(progPinLoc.c_str())); ALOGD("New bpf prog load reusing prog %s, ret: %d (%s)", progPinLoc.c_str(), fd.get(), @@ -1628,7 +1628,7 @@ int loadProg(const char* const elfPath, const unsigned int bpfloader_ver) { applyMapRelo(elfFile, mapFds, cs); - ret = loadCodeSections(elfPath, cs, string(license.data()), "", bpfloader_ver); + ret = loadCodeSections(elfPath, cs, string(license.data()), bpfloader_ver); if (ret) ALOGE("Failed to load programs, loadCodeSections ret=%d", ret); return ret;