ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add new caps from kernel 5.8." am: c625ea6137 am: 4a59a24c0b am: 8e435ba5c6

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1389265

Change-Id: I40dec2b086780a3e48dd661cafdb66fb420fb9dd
This commit is contained in:
Christopher Ferris 2020-08-06 17:24:12 +00:00 • committed by Automerger Merge Worker
commit 4acde5751c
1 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
init/capabilities.cpp
View file

@ -28,47 +28,55 @@ namespace android {
namespace init { namespace init {
static const std::map<std::string, int> cap_map = { static const std::map<std::string, int> cap_map = {
CAP_MAP_ENTRY(CHOWN), CAP_MAP_ENTRY(CHOWN),
CAP_MAP_ENTRY(DAC_OVERRIDE), CAP_MAP_ENTRY(DAC_OVERRIDE),
CAP_MAP_ENTRY(DAC_READ_SEARCH), CAP_MAP_ENTRY(DAC_READ_SEARCH),
CAP_MAP_ENTRY(FOWNER), CAP_MAP_ENTRY(FOWNER),
CAP_MAP_ENTRY(FSETID), CAP_MAP_ENTRY(FSETID),
CAP_MAP_ENTRY(KILL), CAP_MAP_ENTRY(KILL),
CAP_MAP_ENTRY(SETGID), CAP_MAP_ENTRY(SETGID),
CAP_MAP_ENTRY(SETUID), CAP_MAP_ENTRY(SETUID),
CAP_MAP_ENTRY(SETPCAP), CAP_MAP_ENTRY(SETPCAP),
CAP_MAP_ENTRY(LINUX_IMMUTABLE), CAP_MAP_ENTRY(LINUX_IMMUTABLE),
CAP_MAP_ENTRY(NET_BIND_SERVICE), CAP_MAP_ENTRY(NET_BIND_SERVICE),
CAP_MAP_ENTRY(NET_BROADCAST), CAP_MAP_ENTRY(NET_BROADCAST),
CAP_MAP_ENTRY(NET_ADMIN), CAP_MAP_ENTRY(NET_ADMIN),
CAP_MAP_ENTRY(NET_RAW), CAP_MAP_ENTRY(NET_RAW),
CAP_MAP_ENTRY(IPC_LOCK), CAP_MAP_ENTRY(IPC_LOCK),
CAP_MAP_ENTRY(IPC_OWNER), CAP_MAP_ENTRY(IPC_OWNER),
CAP_MAP_ENTRY(SYS_MODULE), CAP_MAP_ENTRY(SYS_MODULE),
CAP_MAP_ENTRY(SYS_RAWIO), CAP_MAP_ENTRY(SYS_RAWIO),
CAP_MAP_ENTRY(SYS_CHROOT), CAP_MAP_ENTRY(SYS_CHROOT),
CAP_MAP_ENTRY(SYS_PTRACE), CAP_MAP_ENTRY(SYS_PTRACE),
CAP_MAP_ENTRY(SYS_PACCT), CAP_MAP_ENTRY(SYS_PACCT),
CAP_MAP_ENTRY(SYS_ADMIN), CAP_MAP_ENTRY(SYS_ADMIN),
CAP_MAP_ENTRY(SYS_BOOT), CAP_MAP_ENTRY(SYS_BOOT),
CAP_MAP_ENTRY(SYS_NICE), CAP_MAP_ENTRY(SYS_NICE),
CAP_MAP_ENTRY(SYS_RESOURCE), CAP_MAP_ENTRY(SYS_RESOURCE),
CAP_MAP_ENTRY(SYS_TIME), CAP_MAP_ENTRY(SYS_TIME),
CAP_MAP_ENTRY(SYS_TTY_CONFIG), CAP_MAP_ENTRY(SYS_TTY_CONFIG),
CAP_MAP_ENTRY(MKNOD), CAP_MAP_ENTRY(MKNOD),
CAP_MAP_ENTRY(LEASE), CAP_MAP_ENTRY(LEASE),
CAP_MAP_ENTRY(AUDIT_WRITE), CAP_MAP_ENTRY(AUDIT_WRITE),
CAP_MAP_ENTRY(AUDIT_CONTROL), CAP_MAP_ENTRY(AUDIT_CONTROL),
CAP_MAP_ENTRY(SETFCAP), CAP_MAP_ENTRY(SETFCAP),
CAP_MAP_ENTRY(MAC_OVERRIDE), CAP_MAP_ENTRY(MAC_OVERRIDE),
CAP_MAP_ENTRY(MAC_ADMIN), CAP_MAP_ENTRY(MAC_ADMIN),
CAP_MAP_ENTRY(SYSLOG), CAP_MAP_ENTRY(SYSLOG),
CAP_MAP_ENTRY(WAKE_ALARM), CAP_MAP_ENTRY(WAKE_ALARM),
CAP_MAP_ENTRY(BLOCK_SUSPEND), CAP_MAP_ENTRY(BLOCK_SUSPEND),
CAP_MAP_ENTRY(AUDIT_READ), CAP_MAP_ENTRY(AUDIT_READ),
#if defined(__BIONIC__)
CAP_MAP_ENTRY(PERFMON),
CAP_MAP_ENTRY(BPF),
#endif
}; };
#if defined(__BIONIC__)
static_assert(CAP_LAST_CAP == CAP_BPF, "CAP_LAST_CAP is not CAP_BPF");
#else
static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ"); static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ");
#endif
static bool ComputeCapAmbientSupported() { static bool ComputeCapAmbientSupported() {
#if defined(__ANDROID__) #if defined(__ANDROID__)