diff --git a/BoardConfig.mk b/BoardConfig.mk index b4a6cc1..202c8ba 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -20,7 +20,10 @@ DEVICE_PATH := device/motorola/sanders BOARD_VENDOR := motorola-qcom -TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_PATH)/include +# AIDs and CAPS +TARGET_FS_CONFIG_GEN := \ + $(DEVICE_PATH)/fs_config/mot_aids.txt \ + $(DEVICE_PATH)/fs_config/file_caps.txt # Platform TARGET_BOARD_PLATFORM := msm8953 diff --git a/android_filesystem_config.h b/android_filesystem_config.h deleted file mode 100644 index 6df1d2b..0000000 --- a/android_filesystem_config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -# Copyright (c) 2016, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include - -#define NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS - const struct fs_path_config android_device_files[] = { - // { 00755, AID_UID, AID_GID, (1ULL << CAPABILITY), "PATH_TO_BINARY" }, - { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" }, - { 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" }, -}; \ No newline at end of file diff --git a/device.mk b/device.mk index 9c1393c..ed5f0a6 100644 --- a/device.mk +++ b/device.mk @@ -167,10 +167,6 @@ PRODUCT_PACKAGES += \ FMRadio \ libfmjni -# For android_filesystem_config.h -PRODUCT_PACKAGES += \ - fs_config_files - # Gatekeeper HAL PRODUCT_PACKAGES += \ android.hardware.gatekeeper@1.0-impl diff --git a/fs_config/file_caps.txt b/fs_config/file_caps.txt new file mode 100644 index 0000000..195b5a1 --- /dev/null +++ b/fs_config/file_caps.txt @@ -0,0 +1,32 @@ +# +# Copyright (C) 2017 The LineageOS 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. + +[system/bin/imsdatadaemon] +user: AID_SYSTEM +group: AID_SYSTEM +mode: 0755 +caps: NET_BIND_SERVICE + +[system/bin/ims_rtp_daemon] +user: AID_SYSTEM +group: AID_RADIO +mode: 0755 +caps: NET_BIND_SERVICE + +[system/bin/pm-service] +user: AID_SYSTEM +group: AID_SYSTEM +mode: 0755 +caps: NET_BIND_SERVICE diff --git a/fs_config/mot_aids.txt b/fs_config/mot_aids.txt new file mode 100644 index 0000000..d89f6f0 --- /dev/null +++ b/fs_config/mot_aids.txt @@ -0,0 +1,86 @@ +# +# Copyright (C) 2017 The LineageOS 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. + +[AID_MOT_ACCY] +value: 5000 + +[AID_MOT_PWRIC] +value: 5001 + +[AID_MOT_USB] +value: 5002 + +[AID_MOT_DRM] +value: 5003 + +[AID_MOT_TCMD] +value: 5004 + +[AID_MOT_SEC_RTC] +value: 5005 + +[AID_MOT_TOMBSTONE] +value: 5006 + +[AID_MOT_TPAPI] +value: 5007 + +[AID_MOT_SECCLKD] +value: 5008 + +[AID_MOT_WHISPER] +value: 5009 + +[AID_MOT_CAIF] +value: 5010 + +[AID_MOT_DLNA] +value: 5011 + +[AID_MOT_ATVC] +value: 5012 + +[AID_MOT_DBVC] +value: 5014 + +[AID_FINGERP] +value: 5015 + +[AID_MOT_ESDFS] +value: 5016 + +[AID_MOT_ESDFS] +value: 5016 + +[AID_MOT_ESDFS] +value: 5016 + +[AID_POWER] +value: 5017 + +[AID_ITSON] +value: 5018 + +[AID_MOT_DTV] +value: 5019 + +[AID_MOT_MOD] +value: 5020 + +[AID_MOT_SHARED] +value: 5323 + +[AID_MOT_COMMON] +value: 5341 diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h deleted file mode 100644 index 2179fac..0000000 --- a/include/private/android_filesystem_config.h +++ /dev/null @@ -1,324 +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 -#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_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_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_SENSORS 3011 /* access to /dev/socket/sensor_ctl_socket & QCCI/QCSI */ -#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 - -/* Motorola IDs */ -#define AID_MOT_ACCY 9000 /* access to accessory */ -#define AID_MOT_PWRIC 9001 /* power IC */ -#define AID_MOT_USB 9002 /* mot usb */ -#define AID_MOT_DRM 9003 /* can access DRM resource. */ -#define AID_MOT_TCMD 9004 /* mot_tcmd */ -#define AID_MOT_SEC_RTC 9005 /* mot cpcap rtc */ -#define AID_MOT_TOMBSTONE 9006 -#define AID_MOT_TPAPI 9007 /* mot_tpapi */ -#define AID_MOT_SECCLKD 9008 /* mot_secclkd */ -#define AID_MOT_WHISPER 9009 /* Whisper Protocol access */ -#define AID_MOT_CAIF 9010 /* can create CAIF sockets */ -#define AID_MOT_DLNA 9011 /* DLNA native */ -#define AID_MOT_ATVC 9012 /* mot_atvc - This is for use of the ATVC service ONLY */ -#define AID_SPRINT_EXTENSION 9013 /* IKASANTISPRINT-149 sprint extension service */ -#define AID_MOT_DBVC 9014 /* mot_dbvc - This group is used to access DataBlock feature related data */ -#define AID_FINGERP 9015 /* IKFPS-98 Add permission group for fingerprint */ -#define AID_MOT_ESDFS 9016 /* mot_esdfs for ESDFS package list parsing */ -#define AID_POWER 9017 /* power management */ -#define AID_ITSON 9018 /* itson permission */ -#define AID_MOT_DTV 9019 /* dtv */ -#define AID_MOT_MOD 9020 /* can interact with motorola mod HW */ - -#define AID_MOT_SHARED 9323 /* motorola shared uid, IKSWM-342 */ -#define AID_MOT_COMMON 9341 /* motorola common uid, IKSWM-342 */ -/* Motorola IDs */ - -#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 /* TODO: switch users over to AID_USER_OFFSET */ -#define AID_USER_OFFSET 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, }, - - { "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, }, - - /* Motorola IDs */ - { "mot_accy", AID_MOT_ACCY, }, - { "mot_pwric", AID_MOT_PWRIC, }, - { "mot_usb", AID_MOT_USB, }, - { "mot_drm", AID_MOT_DRM, }, - { "mot_tcmd", AID_MOT_TCMD, }, - { "mot_sec_rtc", AID_MOT_SEC_RTC, }, - { "mot_tombstone", AID_MOT_TOMBSTONE, }, - { "mot_tpapi", AID_MOT_TPAPI, }, - { "mot_secclkd", AID_MOT_SECCLKD, }, - { "mot_whisper", AID_MOT_WHISPER, }, - { "mot_caif", AID_MOT_CAIF, }, - { "mot_dlna", AID_MOT_DLNA, }, - { "mot_atvc", AID_MOT_ATVC, }, - { "sprint_extension", AID_SPRINT_EXTENSION, }, - { "mot_dbvc", AID_MOT_DBVC, }, - { "fingerp", AID_FINGERP, }, - { "mot_esdfs", AID_MOT_ESDFS, }, - { "power", AID_POWER, }, - { "itson", AID_ITSON, }, - { "mot_dtv", AID_MOT_DTV, }, - { "mot_shared", AID_MOT_SHARED, }, - { "mot_common", AID_MOT_COMMON, }, - { "mot_mod", AID_MOT_MOD, }, - /* Motorola IDs */ -}; - -#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