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

Revert "disable bpfloader selinux_context support"

Browse source 
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)

This is a cherrypick to tm-dev of reviewed/approved but unsubmitted:
  https://android-review.googlesource.com/c/platform/system/bpf/+/2132534

Ignore-AOSP-First: will be cherrypicked to aosp master

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0b3349ef908bbfd225b8b7f83b2a4a8870c1e409
This commit is contained in:
Maciej Żenczykowski 2022-06-21 09:41:59 -07:00
parent a529b323af
commit 98ec8cf05b
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)) {