diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /init/capabilities.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'init/capabilities.cpp')
| -rw-r--r-- | init/capabilities.cpp | 84 |
1 files changed, 46 insertions, 38 deletions
diff --git a/init/capabilities.cpp b/init/capabilities.cpp index a91cd1dd1..0b9f16107 100644 --- a/init/capabilities.cpp +++ b/init/capabilities.cpp @@ -28,47 +28,55 @@ namespace android { namespace init { static const std::map<std::string, int> cap_map = { - CAP_MAP_ENTRY(CHOWN), - CAP_MAP_ENTRY(DAC_OVERRIDE), - CAP_MAP_ENTRY(DAC_READ_SEARCH), - CAP_MAP_ENTRY(FOWNER), - CAP_MAP_ENTRY(FSETID), - CAP_MAP_ENTRY(KILL), - CAP_MAP_ENTRY(SETGID), - CAP_MAP_ENTRY(SETUID), - CAP_MAP_ENTRY(SETPCAP), - CAP_MAP_ENTRY(LINUX_IMMUTABLE), - CAP_MAP_ENTRY(NET_BIND_SERVICE), - CAP_MAP_ENTRY(NET_BROADCAST), - CAP_MAP_ENTRY(NET_ADMIN), - CAP_MAP_ENTRY(NET_RAW), - CAP_MAP_ENTRY(IPC_LOCK), - CAP_MAP_ENTRY(IPC_OWNER), - CAP_MAP_ENTRY(SYS_MODULE), - CAP_MAP_ENTRY(SYS_RAWIO), - CAP_MAP_ENTRY(SYS_CHROOT), - CAP_MAP_ENTRY(SYS_PTRACE), - CAP_MAP_ENTRY(SYS_PACCT), - CAP_MAP_ENTRY(SYS_ADMIN), - CAP_MAP_ENTRY(SYS_BOOT), - CAP_MAP_ENTRY(SYS_NICE), - CAP_MAP_ENTRY(SYS_RESOURCE), - CAP_MAP_ENTRY(SYS_TIME), - CAP_MAP_ENTRY(SYS_TTY_CONFIG), - CAP_MAP_ENTRY(MKNOD), - CAP_MAP_ENTRY(LEASE), - CAP_MAP_ENTRY(AUDIT_WRITE), - CAP_MAP_ENTRY(AUDIT_CONTROL), - CAP_MAP_ENTRY(SETFCAP), - CAP_MAP_ENTRY(MAC_OVERRIDE), - CAP_MAP_ENTRY(MAC_ADMIN), - CAP_MAP_ENTRY(SYSLOG), - CAP_MAP_ENTRY(WAKE_ALARM), - CAP_MAP_ENTRY(BLOCK_SUSPEND), - CAP_MAP_ENTRY(AUDIT_READ), + CAP_MAP_ENTRY(CHOWN), + CAP_MAP_ENTRY(DAC_OVERRIDE), + CAP_MAP_ENTRY(DAC_READ_SEARCH), + CAP_MAP_ENTRY(FOWNER), + CAP_MAP_ENTRY(FSETID), + CAP_MAP_ENTRY(KILL), + CAP_MAP_ENTRY(SETGID), + CAP_MAP_ENTRY(SETUID), + CAP_MAP_ENTRY(SETPCAP), + CAP_MAP_ENTRY(LINUX_IMMUTABLE), + CAP_MAP_ENTRY(NET_BIND_SERVICE), + CAP_MAP_ENTRY(NET_BROADCAST), + CAP_MAP_ENTRY(NET_ADMIN), + CAP_MAP_ENTRY(NET_RAW), + CAP_MAP_ENTRY(IPC_LOCK), + CAP_MAP_ENTRY(IPC_OWNER), + CAP_MAP_ENTRY(SYS_MODULE), + CAP_MAP_ENTRY(SYS_RAWIO), + CAP_MAP_ENTRY(SYS_CHROOT), + CAP_MAP_ENTRY(SYS_PTRACE), + CAP_MAP_ENTRY(SYS_PACCT), + CAP_MAP_ENTRY(SYS_ADMIN), + CAP_MAP_ENTRY(SYS_BOOT), + CAP_MAP_ENTRY(SYS_NICE), + CAP_MAP_ENTRY(SYS_RESOURCE), + CAP_MAP_ENTRY(SYS_TIME), + CAP_MAP_ENTRY(SYS_TTY_CONFIG), + CAP_MAP_ENTRY(MKNOD), + CAP_MAP_ENTRY(LEASE), + CAP_MAP_ENTRY(AUDIT_WRITE), + CAP_MAP_ENTRY(AUDIT_CONTROL), + CAP_MAP_ENTRY(SETFCAP), + CAP_MAP_ENTRY(MAC_OVERRIDE), + CAP_MAP_ENTRY(MAC_ADMIN), + CAP_MAP_ENTRY(SYSLOG), + CAP_MAP_ENTRY(WAKE_ALARM), + CAP_MAP_ENTRY(BLOCK_SUSPEND), + 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"); +#endif static bool ComputeCapAmbientSupported() { #if defined(__ANDROID__) |