commit c2326085e07ee9b20861c1d0a0b009390cd3c08b
author Maciej Żenczykowski <maze@google.com> Thu Aug 15 21:36:49 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 15 21:36:49 2024 +0000
tree 21ce3a8872ada55090bd6ac798bdb1a8d63abdbe
parent 784ae337adf9b9e6576f56ac612f8f98f0714192
parent 383c055281cbf11c693d97fde478aa5ed4ab683f

NetBpfLoad: remove support for bpfloader_min_required_ver am: 383c055281

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3221020

Change-Id: Ica209b610b9fb06ed2ea64451055713d80859665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

netbpfload/NetBpfLoad.cpp

diff --git a/netbpfload/NetBpfLoad.cpp b/netbpfload/NetBpfLoad.cpp
index f4aec7a..dd16669 100644
--- a/netbpfload/NetBpfLoad.cpp
+++ b/netbpfload/NetBpfLoad.cpp
@@ -1126,8 +1126,6 @@
             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 =
@@ -1147,12 +1145,6 @@
         return 0;
     }
 
-    if (bpfloader_ver < bpfLoaderMinRequiredVer) {
-        ALOGI("BpfLoader version 0x%05x failing due to ELF object %s with required min ver 0x%05x",
-              bpfloader_ver, elfPath, bpfLoaderMinRequiredVer);
-        return -1;
-    }
-
     ALOGI("BpfLoader version 0x%05x processing ELF object %s with ver [0x%05x,0x%05x)",
           bpfloader_ver, elfPath, bpfLoaderMinVer, bpfLoaderMaxVer);