tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "BpfLoader v0.28 - if (map.zero != 0) abort()" am: 15f1bf8928 am: 17080ca9da am: 91048037ac am: 38aa72f299

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2163056

Change-Id: I3ded5dd86555c1ee0d081f29c3a8769da43eaa31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-07-22 01:19:58 +00:00 committed by Automerger Merge Worker
commit 56d4d8f676
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libbpf_android/Loader.cpp
View file

@ -30,9 +30,9 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
// This is BpfLoader v0.27 // This is BpfLoader v0.28
#define BPFLOADER_VERSION_MAJOR 0u #define BPFLOADER_VERSION_MAJOR 0u
#define BPFLOADER_VERSION_MINOR 27u #define BPFLOADER_VERSION_MINOR 28u
#define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR) #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"
@ -737,6 +737,8 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
} }
for (int i = 0; i < (int)mapNames.size(); i++) { for (int i = 0; i < (int)mapNames.size(); i++) {
if (md[i].zero != 0) abort();
if (BPFLOADER_VERSION < md[i].bpfloader_min_ver) { if (BPFLOADER_VERSION < md[i].bpfloader_min_ver) {
ALOGI("skipping map %s which requires bpfloader min ver 0x%05x", mapNames[i].c_str(), ALOGI("skipping map %s which requires bpfloader min ver 0x%05x", mapNames[i].c_str(),
md[i].bpfloader_min_ver); md[i].bpfloader_min_ver);