tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa am: 199963b767

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I88125669904e2f8c837d977518cdc707791b03cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2022-06-23 12:00:38 +00:00 committed by Automerger Merge Worker
commit 63d22e6614
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libbpf_android/Loader.cpp
View file

@ -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 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>&
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 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
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)) {