commit e867b84dae30378b7f260ee41745cb3c518c70b1
author Maciej Żenczykowski <maze@google.com> Fri Jul 01 20:14:44 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 01 20:14:44 2022 +0000
tree 9ae1954bbdf0c5d9afb780e03b0f6722af61337d
parent 81329bd9e99c97280bf9d4280ec674e49064d5fc
parent 5e4aabfcaae66b6a169dfe4fb623c2f4d9da5b89

Merge "Perform map chmod *before* chown"

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 0e9d005..15a3950 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.20
+// This is BpfLoader v0.21
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 20u
+#define BPFLOADER_VERSION_MINOR 21u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"
@@ -877,13 +877,6 @@
                     return -err;
                 }
             }
-            ret = chown(mapPinLoc.c_str(), (uid_t)md[i].uid, (gid_t)md[i].gid);
-            if (ret) {
-                int err = errno;
-                ALOGE("chown(%s, %u, %u) = %d [%d:%s]", mapPinLoc.c_str(), md[i].uid, md[i].gid,
-                      ret, err, strerror(err));
-                return -err;
-            }
             ret = chmod(mapPinLoc.c_str(), md[i].mode);
             if (ret) {
                 int err = errno;
@@ -891,6 +884,13 @@
                       strerror(err));
                 return -err;
             }
+            ret = chown(mapPinLoc.c_str(), (uid_t)md[i].uid, (gid_t)md[i].gid);
+            if (ret) {
+                int err = errno;
+                ALOGE("chown(%s, %u, %u) = %d [%d:%s]", mapPinLoc.c_str(), md[i].uid, md[i].gid,
+                      ret, err, strerror(err));
+                return -err;
+            }
         }
 
         struct bpf_map_info map_info = {};