From 6005089d1cf42126b4e43d7cb01a64930047489c Mon Sep 17 00:00:00 2001 From: tomascus Date: Tue, 30 May 2017 14:21:56 +1000 Subject: shinano-common: move android_filesystem_capability to msm8974-common Revert "copy android_filesystem_capability locally" This reverts commit 11a4704f7e55c67a2ca81121036e82a7154f25d6. Change-Id: I36402fb6d89a04ae025f83bab4363a2d9e499281 --- include/private/android_filesystem_capability.h | 119 ---------- include/private/android_filesystem_config.h | 297 ------------------------ 2 files changed, 416 deletions(-) delete mode 100644 include/private/android_filesystem_capability.h delete mode 100644 include/private/android_filesystem_config.h diff --git a/include/private/android_filesystem_capability.h b/include/private/android_filesystem_capability.h deleted file mode 100644 index b92d3db..0000000 --- a/include/private/android_filesystem_capability.h +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Taken from linux/capability.h, with minor modifications - */ - -#ifndef _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_FILESYSTEM_CAPABILITY_H -#define _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_FILESYSTEM_CAPABILITY_H - -#include - -#define __user -#define __u32 uint32_t -#define __le32 uint32_t - -#define _LINUX_CAPABILITY_VERSION_1 0x19980330 -#define _LINUX_CAPABILITY_U32S_1 1 -#define _LINUX_CAPABILITY_VERSION_2 0x20071026 -#define _LINUX_CAPABILITY_U32S_2 2 -#define _LINUX_CAPABILITY_VERSION_3 0x20080522 -#define _LINUX_CAPABILITY_U32S_3 2 - -typedef struct __user_cap_header_struct { - __u32 version; - int pid; -} __user *cap_user_header_t; - -typedef struct __user_cap_data_struct { - __u32 effective; - __u32 permitted; - __u32 inheritable; -} __user *cap_user_data_t; - -#define VFS_CAP_REVISION_MASK 0xFF000000 -#define VFS_CAP_REVISION_SHIFT 24 -#define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK -#define VFS_CAP_FLAGS_EFFECTIVE 0x000001 -#define VFS_CAP_REVISION_1 0x01000000 -#define VFS_CAP_U32_1 1 -#define XATTR_CAPS_SZ_1 (sizeof(__le32)*(1 + 2*VFS_CAP_U32_1)) -#define VFS_CAP_REVISION_2 0x02000000 -#define VFS_CAP_U32_2 2 -#define XATTR_CAPS_SZ_2 (sizeof(__le32)*(1 + 2*VFS_CAP_U32_2)) -#define XATTR_CAPS_SZ XATTR_CAPS_SZ_2 -#define VFS_CAP_U32 VFS_CAP_U32_2 -#define VFS_CAP_REVISION VFS_CAP_REVISION_2 - -struct vfs_cap_data { - __le32 magic_etc; - struct { - __le32 permitted; - __le32 inheritable; - } data[VFS_CAP_U32]; -}; - -#define _LINUX_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_1 -#define _LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_1 -#define CAP_CHOWN 0 -#define CAP_DAC_OVERRIDE 1 -#define CAP_DAC_READ_SEARCH 2 -#define CAP_FOWNER 3 -#define CAP_FSETID 4 -#define CAP_KILL 5 -#define CAP_SETGID 6 -#define CAP_SETUID 7 -#define CAP_SETPCAP 8 -#define CAP_LINUX_IMMUTABLE 9 -#define CAP_NET_BIND_SERVICE 10 -#define CAP_NET_BROADCAST 11 -#define CAP_NET_ADMIN 12 -#define CAP_NET_RAW 13 -#define CAP_IPC_LOCK 14 -#define CAP_IPC_OWNER 15 -#define CAP_SYS_MODULE 16 -#define CAP_SYS_RAWIO 17 -#define CAP_SYS_CHROOT 18 -#define CAP_SYS_PTRACE 19 -#define CAP_SYS_PACCT 20 -#define CAP_SYS_ADMIN 21 -#define CAP_SYS_BOOT 22 -#define CAP_SYS_NICE 23 -#define CAP_SYS_RESOURCE 24 -#define CAP_SYS_TIME 25 -#define CAP_SYS_TTY_CONFIG 26 -#define CAP_MKNOD 27 -#define CAP_LEASE 28 -#define CAP_AUDIT_WRITE 29 -#define CAP_AUDIT_CONTROL 30 -#define CAP_SETFCAP 31 -#define CAP_MAC_OVERRIDE 32 -#define CAP_MAC_ADMIN 33 -#define CAP_SYSLOG 34 -#define CAP_WAKE_ALARM 35 -#define CAP_BLOCK_SUSPEND 36 -#define CAP_AUDIT_READ 37 -#define CAP_LAST_CAP CAP_AUDIT_READ -#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) -#define CAP_TO_INDEX(x) ((x) >> 5) -#define CAP_TO_MASK(x) (1 << ((x) & 31)) - -#undef __user -#undef __u32 -#undef __le32 - -#endif diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h deleted file mode 100644 index 0ad4ef5..0000000 --- a/include/private/android_filesystem_config.h +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Copyright (C) 2007 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* This file is used to define the properties of the filesystem -** images generated by build tools (mkbootfs and mkyaffs2image) and -** by the device side of adb. -*/ - -#ifndef _ANDROID_FILESYSTEM_CONFIG_H_ -#define _ANDROID_FILESYSTEM_CONFIG_H_ - -#include -#include -#include - -#if defined(__ANDROID__) -#include -#else -#include "android_filesystem_capability.h" -#endif - -#define CAP_MASK_LONG(cap_name) (1ULL << (cap_name)) - -/* This is the master Users and Groups config for the platform. - * DO NOT EVER RENUMBER - */ - -#define AID_ROOT 0 /* traditional unix root user */ - -#define AID_SYSTEM 1000 /* system server */ - -#define AID_RADIO 1001 /* telephony subsystem, RIL */ -#define AID_BLUETOOTH 1002 /* bluetooth subsystem */ -#define AID_GRAPHICS 1003 /* graphics devices */ -#define AID_INPUT 1004 /* input devices */ -#define AID_AUDIO 1005 /* audio devices */ -#define AID_CAMERA 1006 /* camera devices */ -#define AID_LOG 1007 /* log devices */ -#define AID_COMPASS 1008 /* compass device */ -#define AID_MOUNT 1009 /* mountd socket */ -#define AID_WIFI 1010 /* wifi subsystem */ -#define AID_ADB 1011 /* android debug bridge (adbd) */ -#define AID_INSTALL 1012 /* group for installing packages */ -#define AID_MEDIA 1013 /* mediaserver process */ -#define AID_DHCP 1014 /* dhcp client */ -#define AID_SDCARD_RW 1015 /* external storage write access */ -#define AID_VPN 1016 /* vpn system */ -#define AID_KEYSTORE 1017 /* keystore subsystem */ -#define AID_USB 1018 /* USB devices */ -#define AID_DRM 1019 /* DRM server */ -#define AID_MDNSR 1020 /* MulticastDNSResponder (service discovery) */ -#define AID_GPS 1021 /* GPS daemon */ -#define AID_UNUSED1 1022 /* deprecated, DO NOT USE */ -#define AID_MEDIA_RW 1023 /* internal media storage write access */ -#define AID_MTP 1024 /* MTP USB driver access */ -#define AID_UNUSED2 1025 /* deprecated, DO NOT USE */ -#define AID_DRMRPC 1026 /* group for drm rpc */ -#define AID_NFC 1027 /* nfc subsystem */ -#define AID_SDCARD_R 1028 /* external storage read access */ -#define AID_CLAT 1029 /* clat part of nat464 */ -#define AID_LOOP_RADIO 1030 /* loop radio devices */ -#define AID_MEDIA_DRM 1031 /* MediaDrm plugins */ -#define AID_PACKAGE_INFO 1032 /* access to installed package details */ -#define AID_SDCARD_PICS 1033 /* external storage photos access */ -#define AID_SDCARD_AV 1034 /* external storage audio/video access */ -#define AID_SDCARD_ALL 1035 /* access all users external storage */ -#define AID_LOGD 1036 /* log daemon */ -#define AID_SHARED_RELRO 1037 /* creator of shared GNU RELRO files */ -#define AID_DBUS 1038 /* dbus-daemon IPC broker process */ -#define AID_TLSDATE 1039 /* tlsdate unprivileged user */ -#define AID_MEDIA_EX 1040 /* mediaextractor process */ -#define AID_AUDIOSERVER 1041 /* audioserver process */ -#define AID_METRICS_COLL 1042 /* metrics_collector process */ -#define AID_METRICSD 1043 /* metricsd process */ -#define AID_WEBSERV 1044 /* webservd process */ -#define AID_DEBUGGERD 1045 /* debuggerd unprivileged user */ -#define AID_MEDIA_CODEC 1046 /* mediacodec process */ -#define AID_CAMERASERVER 1047 /* cameraserver process */ -#define AID_FIREWALL 1048 /* firewalld process */ -#define AID_TRUNKS 1049 /* trunksd process (TPM daemon) */ -#define AID_NVRAM 1050 /* Access-controlled NVRAM */ -#define AID_DNS 1051 /* DNS resolution daemon (system: netd) */ -#define AID_DNS_TETHER 1052 /* DNS resolution daemon (tether: dnsmasq) */ -/* Changes to this file must be made in AOSP, *not* in internal branches. */ - -#define AID_SHELL 2000 /* adb and debug shell user */ -#define AID_CACHE 2001 /* cache access */ -#define AID_DIAG 2002 /* access to diagnostic resources */ - -/* The range 2900-2999 is reserved for OEM, and must never be - * used here */ -#define AID_OEM_RESERVED_START 2900 - -#define AID_QCOM_DIAG 2950 /* access to QTI diagnostic resources */ -#define AID_RFS 2951 /* Remote Filesystem for peripheral processors */ -#define AID_RFS_SHARED 2952 /* Shared files for Remote Filesystem for peripheral processors */ - -#define AID_IDD 2987 /* SONY idd */ -#define AID_UPDATEMISCTA 2991 /* SONY updatemiscta */ -#define AID_TRIMAREA 2993 /* SONY trimarea */ -#define AID_CREDMGR_CLI 2996 /* SONY credmgr_client */ -#define AID_TAD 2997 /* SONY tad */ -#define AID_TA_QMI 2998 /* SONY ta_qmi */ - -#define AID_OEM_RESERVED_END 2999 - -/* The 3000 series are intended for use as supplemental group id's only. - * They indicate special Android capabilities that the kernel is aware of. */ -#define AID_NET_BT_ADMIN 3001 /* bluetooth: create any socket */ -#define AID_NET_BT 3002 /* bluetooth: create sco, rfcomm or l2cap sockets */ -#define AID_INET 3003 /* can create AF_INET and AF_INET6 sockets */ -#define AID_NET_RAW 3004 /* can create raw INET sockets */ -#define AID_NET_ADMIN 3005 /* can configure interfaces and routing tables. */ -#define AID_NET_BW_STATS 3006 /* read bandwidth statistics */ -#define AID_NET_BW_ACCT 3007 /* change bandwidth statistics accounting */ -#define AID_NET_BT_STACK 3008 /* bluetooth: access config files */ -#define AID_READPROC 3009 /* Allow /proc read access */ -#define AID_WAKELOCK 3010 /* Allow system wakelock read/write access */ - -#define AID_RFS_OLD 3012 /* DEPRECATED OLD ID FOR RFS, DO NOT USE */ -#define AID_RFS_SHARED_OLD 3013 /* DEPRECATED OLD ID FOR RFS-SHARED */ - -/* The range 5000-5999 is also reserved for OEM, and must never be used here. */ -#define AID_OEM_RESERVED_2_START 5000 -#define AID_OEM_RESERVED_2_END 5999 -#define AID_SENSORS 3011 /* access to /dev/socket/sensor_ctl_socket & QCCI/QCSI */ - - -#define AID_EVERYBODY 9997 /* shared between all apps in the same profile */ -#define AID_MISC 9998 /* access to misc storage */ -#define AID_NOBODY 9999 - -#define AID_APP 10000 /* first app user */ - -#define AID_ISOLATED_START 99000 /* start of uids for fully isolated sandboxed processes */ -#define AID_ISOLATED_END 99999 /* end of uids for fully isolated sandboxed processes */ - -#define AID_USER 100000 /* offset for uid ranges for each user */ - -#define AID_SHARED_GID_START 50000 /* start of gids for apps in each user to share */ -#define AID_SHARED_GID_END 59999 /* start of gids for apps in each user to share */ - -#if !defined(EXCLUDE_FS_CONFIG_STRUCTURES) -/* - * Used in: - * bionic/libc/bionic/stubs.cpp - * external/libselinux/src/android.c - * system/core/logd/LogStatistics.cpp - * system/core/init/ueventd.cpp - * system/core/init/util.cpp - */ -struct android_id_info { - const char *name; - unsigned aid; -}; - -static const struct android_id_info android_ids[] = { - { "root", AID_ROOT, }, - - { "system", AID_SYSTEM, }, - - { "radio", AID_RADIO, }, - { "bluetooth", AID_BLUETOOTH, }, - { "graphics", AID_GRAPHICS, }, - { "input", AID_INPUT, }, - { "audio", AID_AUDIO, }, - { "camera", AID_CAMERA, }, - { "log", AID_LOG, }, - { "compass", AID_COMPASS, }, - { "mount", AID_MOUNT, }, - { "wifi", AID_WIFI, }, - { "adb", AID_ADB, }, - { "install", AID_INSTALL, }, - { "media", AID_MEDIA, }, - { "dhcp", AID_DHCP, }, - { "sdcard_rw", AID_SDCARD_RW, }, - { "vpn", AID_VPN, }, - { "keystore", AID_KEYSTORE, }, - { "usb", AID_USB, }, - { "drm", AID_DRM, }, - { "mdnsr", AID_MDNSR, }, - { "gps", AID_GPS, }, - // AID_UNUSED1 - { "media_rw", AID_MEDIA_RW, }, - { "mtp", AID_MTP, }, - // AID_UNUSED2 - { "drmrpc", AID_DRMRPC, }, - { "nfc", AID_NFC, }, - { "sdcard_r", AID_SDCARD_R, }, - { "clat", AID_CLAT, }, - { "loop_radio", AID_LOOP_RADIO, }, - { "mediadrm", AID_MEDIA_DRM, }, - { "package_info", AID_PACKAGE_INFO, }, - { "sdcard_pics", AID_SDCARD_PICS, }, - { "sdcard_av", AID_SDCARD_AV, }, - { "sdcard_all", AID_SDCARD_ALL, }, - { "logd", AID_LOGD, }, - { "shared_relro", AID_SHARED_RELRO, }, - { "dbus", AID_DBUS, }, - { "tlsdate", AID_TLSDATE, }, - { "mediaex", AID_MEDIA_EX, }, - { "audioserver", AID_AUDIOSERVER, }, - { "metrics_coll", AID_METRICS_COLL }, - { "metricsd", AID_METRICSD }, - { "webserv", AID_WEBSERV }, - { "debuggerd", AID_DEBUGGERD, }, - { "mediacodec", AID_MEDIA_CODEC, }, - { "cameraserver", AID_CAMERASERVER, }, - { "firewall", AID_FIREWALL, }, - { "trunks", AID_TRUNKS, }, - { "nvram", AID_NVRAM, }, - { "dns", AID_DNS, }, - { "dns_tether", AID_DNS_TETHER, }, - - { "shell", AID_SHELL, }, - { "cache", AID_CACHE, }, - { "diag", AID_DIAG, }, - - { "qcom_diag", AID_QCOM_DIAG, }, - - { "rfs", AID_RFS, }, - { "rfs_shared", AID_RFS_SHARED, }, - - { "net_bt_admin", AID_NET_BT_ADMIN, }, - { "net_bt", AID_NET_BT, }, - { "inet", AID_INET, }, - { "net_raw", AID_NET_RAW, }, - { "net_admin", AID_NET_ADMIN, }, - { "net_bw_stats", AID_NET_BW_STATS, }, - { "net_bw_acct", AID_NET_BW_ACCT, }, - { "net_bt_stack", AID_NET_BT_STACK, }, - { "readproc", AID_READPROC, }, - { "wakelock", AID_WAKELOCK, }, - { "sensors", AID_SENSORS, }, - - { "rfs_old", AID_RFS_OLD, }, - { "rfs_shared_old", AID_RFS_SHARED_OLD, }, - - { "everybody", AID_EVERYBODY, }, - { "misc", AID_MISC, }, - { "nobody", AID_NOBODY, }, - - { "idd", AID_IDD, }, - { "updatemiscta", AID_UPDATEMISCTA, }, - { "trimarea", AID_TRIMAREA, }, - { "credmgr_client", AID_CREDMGR_CLI, }, - { "tad", AID_TAD, }, - { "ta_qmi", AID_TA_QMI, }, -}; - -#define android_id_count \ - (sizeof(android_ids) / sizeof(android_ids[0])) - -struct fs_path_config { - unsigned mode; - unsigned uid; - unsigned gid; - uint64_t capabilities; - const char *prefix; -}; - -/* Rules for directories and files has moved to system/code/libcutils/fs_config.c */ - -__BEGIN_DECLS - -/* - * Used in: - * build/tools/fs_config/fs_config.c - * build/tools/fs_get_stats/fs_get_stats.c - * system/extras/ext4_utils/make_ext4fs_main.c - * external/squashfs-tools/squashfs-tools/android.c - * system/core/cpio/mkbootfs.c - * system/core/adb/file_sync_service.cpp - * system/extras/ext4_utils/canned_fs_config.c - */ -void fs_config(const char *path, int dir, const char *target_out_path, - unsigned *uid, unsigned *gid, unsigned *mode, uint64_t *capabilities); - -ssize_t fs_config_generate(char *buffer, size_t length, const struct fs_path_config *pc); - -__END_DECLS - -#endif -#endif -- cgit v1.2.3