diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-07-02 10:02:14 +0000 |
|---|---|---|
| committer | Maciej Zenczykowski <maze@google.com> | 2021-07-02 11:38:17 +0000 |
| commit | d521e47d309e0105589d451c9021f63fd619f108 (patch) | |
| tree | bf458d7db606d0f1b848afffe943ce776e5832c5 | |
| parent | 355b8df7f57bdfa6afe474a93b14c31e8c19d7b2 (diff) | |
| download | bpf-d521e47d309e0105589d451c9021f63fd619f108.tar.gz | |
bpfloader - minor fixups asked for by reviewer
As requested by Bernie on previous commit.
Bug: 190519702
Test: atest, TreeHugger - existing bpf programs load
examination of bpfloader logs
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change: https://android-review.googlesource.com/1754722
Merged-In: I4f5181f371d31dcf52768217ffd2b1b5b772103d
Change-Id: I4f5181f371d31dcf52768217ffd2b1b5b772103d
| -rw-r--r-- | libbpf_android/Loader.cpp | 4 | ||||
| -rw-r--r-- | progs/include/bpf_map_def.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp index c10988d..b1af34f 100644 --- a/libbpf_android/Loader.cpp +++ b/libbpf_android/Loader.cpp @@ -514,14 +514,14 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>& if (BPFLOADER_VERSION < md[i].bpfloader_min_ver) { ALOGI("skipping map %s which requires bpfloader min ver 0x%05x\n", mapNames[i].c_str(), md[i].bpfloader_min_ver); - mapFds.push_back(std::move(fd)); // -1 + mapFds.push_back(unique_fd()); continue; } if (BPFLOADER_VERSION >= md[i].bpfloader_max_ver) { ALOGI("skipping map %s which requires bpfloader max ver 0x%05x\n", mapNames[i].c_str(), md[i].bpfloader_max_ver); - mapFds.push_back(std::move(fd)); // -1 + mapFds.push_back(unique_fd()); continue; } diff --git a/progs/include/bpf_map_def.h b/progs/include/bpf_map_def.h index d80bfe7..b4fdd54 100644 --- a/progs/include/bpf_map_def.h +++ b/progs/include/bpf_map_def.h @@ -48,8 +48,8 @@ #endif // These are the values used if these fields are missing -#define DEFAULT_BPFLOADER_MIN_VER 0u // v0.0 -#define DEFAULT_BPFLOADER_MAX_VER 0x10000u // v1.0 +#define DEFAULT_BPFLOADER_MIN_VER 0u // v0.0 (this is inclusive ie. >= v0.0) +#define DEFAULT_BPFLOADER_MAX_VER 0x10000u // v1.0 (this is exclusive ie. < v1.0) #define DEFAULT_SIZEOF_BPF_MAP_DEF 32 // v0.0 struct: enum + alignment padding + 7 uint #define DEFAULT_SIZEOF_BPF_PROG_DEF 20 // v0.0 struct: 4 uint + bool + alignment padding |