commit 81329bd9e99c97280bf9d4280ec674e49064d5fc
author Maciej Żenczykowski <maze@google.com> Fri Jul 01 20:01:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 01 20:01:30 2022 +0000
tree fa7b0e59ce203a07b431dc960c0be674335ae75d
parent d8259aa1e495f846aac419ca7fdf3ba7877f87d3
parent eb199dd7481e7d1f1f548844c8e7f68cbfbfeaf8

Merge "use mapRetrieveRO() instead of bpf_obj_get()"

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index b66d9c6..0e9d005 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-// This is BpfLoader v0.19
+// This is BpfLoader v0.20
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 19u
+#define BPFLOADER_VERSION_MINOR 20u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"
@@ -822,7 +822,7 @@
         int saved_errno;
 
         if (access(mapPinLoc.c_str(), F_OK) == 0) {
-            fd.reset(bpf_obj_get(mapPinLoc.c_str()));
+            fd.reset(mapRetrieveRO(mapPinLoc.c_str()));
             saved_errno = errno;
             ALOGD("bpf_create_map reusing map %s, ret: %d", mapNames[i].c_str(), fd.get());
             reuse = true;