diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-08 10:58:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-08 10:58:10 +0000 |
commit | 96f60b6db398f3630672142b863ab2b0e67785e9 (patch) | |
tree | 6220993c78405184c8c41a235f25f25ed1930d08 | |
parent | 278a712e6969c3ecae51e50fe1d0f08d0cec1a06 (diff) | |
parent | a5646cb031cd7841fb4b77211e9ed1889e94c673 (diff) | |
download | bpf-96f60b6db398f3630672142b863ab2b0e67785e9.tar.gz |
Merge "BpfLoader: remove version check logic" into main
-rw-r--r-- | libbpf_android/Loader.cpp | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp index 229dd93..7749607 100644 --- a/libbpf_android/Loader.cpp +++ b/libbpf_android/Loader.cpp @@ -1129,39 +1129,12 @@ int loadProg(const char* elfPath, bool* isCritical, const Location& location) { } // the following default values are for bpfloader V0.0 format which does not include them - unsigned int bpfLoaderMinVer = - readSectionUint("bpfloader_min_ver", elfFile, DEFAULT_BPFLOADER_MIN_VER); - unsigned int bpfLoaderMaxVer = - readSectionUint("bpfloader_max_ver", elfFile, DEFAULT_BPFLOADER_MAX_VER); - unsigned int bpfLoaderMinRequiredVer = - readSectionUint("bpfloader_min_required_ver", elfFile, 0); size_t sizeOfBpfMapDef = readSectionUint("size_of_bpf_map_def", elfFile, DEFAULT_SIZEOF_BPF_MAP_DEF); size_t sizeOfBpfProgDef = readSectionUint("size_of_bpf_prog_def", elfFile, DEFAULT_SIZEOF_BPF_PROG_DEF); - // inclusive lower bound check - if (BPFLOADER_VERSION < bpfLoaderMinVer) { - ALOGI("BpfLoader version 0x%05x ignoring ELF object %s with min ver 0x%05x", - BPFLOADER_VERSION, elfPath, bpfLoaderMinVer); - return 0; - } - - // exclusive upper bound check - if (BPFLOADER_VERSION >= bpfLoaderMaxVer) { - ALOGI("BpfLoader version 0x%05x ignoring ELF object %s with max ver 0x%05x", - BPFLOADER_VERSION, elfPath, bpfLoaderMaxVer); - return 0; - } - - if (BPFLOADER_VERSION < bpfLoaderMinRequiredVer) { - ALOGI("BpfLoader version 0x%05x failing due to ELF object %s with required min ver 0x%05x", - BPFLOADER_VERSION, elfPath, bpfLoaderMinRequiredVer); - return -1; - } - - ALOGI("BpfLoader version 0x%05x processing ELF object %s with ver [0x%05x,0x%05x)", - BPFLOADER_VERSION, elfPath, bpfLoaderMinVer, bpfLoaderMaxVer); + ALOGI("Platform BpfLoader processing ELF object %s", elfPath); if (sizeOfBpfMapDef < DEFAULT_SIZEOF_BPF_MAP_DEF) { ALOGE("sizeof(bpf_map_def) of %zu is too small (< %d)", sizeOfBpfMapDef, |