commit 687849e52e7f8725cc965f73213240bdfe1b78aa
author Maciej Żenczykowski <maze@google.com> Tue Jun 21 09:41:59 2022 -0700
committer Maciej Żenczykowski <maze@google.com> Wed Jun 22 19:15:41 2022 +0000
tree ffcd14721c8a6b9f6da98e8d8ab480e8c9b40d32
parent a7a11bda004622534e4ed4ff07a23cf5024a218a

Revert "disable bpfloader selinux_context support"

This reverts commit 8e5e239dd0a7856e486a9e2d772ef3a9e38021eb.

No longer required now that selinux change has landed.

(while we're at it bump the bpfloader version to v0.19 just
 to make sure we can tell these apart in the future)

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0b3349ef908bbfd225b8b7f83b2a4a8870c1e409

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index e5eb29a..47cf4c9 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.18
+// This is BpfLoader v0.19
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 18u
+#define BPFLOADER_VERSION_MINOR 19u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"
@@ -792,8 +792,6 @@
             ALOGI("map %s selinux_context [%32s] -> %d -> '%s' (%s)", mapNames[i].c_str(),
                   md[i].selinux_context, selinux_context, lookupSelinuxContext(selinux_context),
                   lookupPinSubdir(selinux_context));
-            // temp disable until selinux grants bpfloader 'rename' priv
-            selinux_context = domain::unspecified;
         }
 
         domain pin_subdir = getDomainFromPinSubdir(md[i].pin_subdir);
@@ -1020,8 +1018,6 @@
             ALOGI("prog %s selinux_context [%32s] -> %d -> '%s' (%s)", name.c_str(),
                   cs[i].prog_def->selinux_context, selinux_context,
                   lookupSelinuxContext(selinux_context), lookupPinSubdir(selinux_context));
-            // temp disable until selinux grants bpfloader 'rename' priv
-            selinux_context = domain::unspecified;
         }
 
         if (specified(pin_subdir)) {