From 5ba1807f750e9544eb516904646b0f97051b833b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 4 Apr 2015 23:24:52 +0200 Subject: [PATCH 1/1] Remove Android specific code paths Signed-off-by: Jo-Philipp Wich --- canned_fs_config.c | 2 - include/private/android_filesystem_config.h | 306 ---------------------------- make_ext4fs.c | 4 - make_ext4fs_main.c | 15 +- 4 files changed, 1 insertion(+), 326 deletions(-) delete mode 100644 include/private/android_filesystem_config.h diff --git a/canned_fs_config.c b/canned_fs_config.c index 69646b1..ae1d7bd 100644 --- a/canned_fs_config.c +++ b/canned_fs_config.c @@ -20,8 +20,6 @@ #include #include -#include "private/android_filesystem_config.h" - #include "canned_fs_config.h" typedef struct { diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h deleted file mode 100644 index a3d11a7..0000000 --- a/include/private/android_filesystem_config.h +++ /dev/null @@ -1,306 +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 -#include - -#ifdef HAVE_ANDROID_OS -#include -#else -#include "android_filesystem_capability.h" -#endif - -/* 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_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_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_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) -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, }, - - { "shell", AID_SHELL, }, - { "cache", AID_CACHE, }, - { "diag", AID_DIAG, }, - - { "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, }, - - { "everybody", AID_EVERYBODY, }, - { "misc", AID_MISC, }, - { "nobody", AID_NOBODY, }, -}; - -#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. -** These rules are applied based on "first match", so they -** should start with the most specific path and work their -** way up to the root. -*/ - -static const struct fs_path_config android_dirs[] = { - { 00770, AID_SYSTEM, AID_CACHE, 0, "cache" }, - { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/app" }, - { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/app-private" }, - { 00771, AID_ROOT, AID_ROOT, 0, "data/dalvik-cache" }, - { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/data" }, - { 00771, AID_SHELL, AID_SHELL, 0, "data/local/tmp" }, - { 00771, AID_SHELL, AID_SHELL, 0, "data/local" }, - { 01771, AID_SYSTEM, AID_MISC, 0, "data/misc" }, - { 00770, AID_DHCP, AID_DHCP, 0, "data/misc/dhcp" }, - { 00771, AID_SHARED_RELRO, AID_SHARED_RELRO, 0, "data/misc/shared_relro" }, - { 00775, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media" }, - { 00775, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media/Music" }, - { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" }, - { 00750, AID_ROOT, AID_SHELL, 0, "sbin" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/bin" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/vendor" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin" }, - { 00755, AID_ROOT, AID_ROOT, 0, "system/etc/ppp" }, - { 00755, AID_ROOT, AID_SHELL, 0, "vendor" }, - { 00777, AID_ROOT, AID_ROOT, 0, "sdcard" }, - { 00755, AID_ROOT, AID_ROOT, 0, 0 }, -}; - -/* Rules for files. -** These rules are applied based on "first match", so they -** should start with the most specific path and work their -** way up to the root. Prefixes ending in * denotes wildcard -** and will allow partial matches. -*/ -static const struct fs_path_config android_files[] = { - { 00440, AID_ROOT, AID_SHELL, 0, "system/etc/init.goldfish.rc" }, - { 00550, AID_ROOT, AID_SHELL, 0, "system/etc/init.goldfish.sh" }, - { 00550, AID_ROOT, AID_SHELL, 0, "system/etc/init.ril" }, - { 00550, AID_DHCP, AID_SHELL, 0, "system/etc/dhcpcd/dhcpcd-run-hooks" }, - { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/ppp/*" }, - { 00555, AID_ROOT, AID_ROOT, 0, "system/etc/rc.*" }, - { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app/*" }, - { 00644, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media/*" }, - { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app-private/*" }, - { 00644, AID_APP, AID_APP, 0, "data/data/*" }, - - /* the following five files are INTENTIONALLY set-uid, but they - * are NOT included on user builds. */ - { 04750, AID_ROOT, AID_SHELL, 0, "system/xbin/su" }, - { 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/librank" }, - { 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/procrank" }, - { 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/procmem" }, - { 04770, AID_ROOT, AID_RADIO, 0, "system/bin/pppd-ril" }, - - /* the following files have enhanced capabilities and ARE included in user builds. */ - { 00750, AID_ROOT, AID_SHELL, (1 << CAP_SETUID) | (1 << CAP_SETGID), "system/bin/run-as" }, - - { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/uncrypt" }, - { 00750, AID_ROOT, AID_ROOT, 0, "system/bin/install-recovery.sh" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/bin/*" }, - { 00755, AID_ROOT, AID_ROOT, 0, "system/lib/valgrind/*" }, - { 00755, AID_ROOT, AID_ROOT, 0, "system/lib64/valgrind/*" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/vendor/bin/*" }, - { 00755, AID_ROOT, AID_SHELL, 0, "vendor/bin/*" }, - { 00750, AID_ROOT, AID_SHELL, 0, "sbin/*" }, - { 00755, AID_ROOT, AID_ROOT, 0, "bin/*" }, - { 00750, AID_ROOT, AID_SHELL, 0, "init*" }, - { 00750, AID_ROOT, AID_SHELL, 0, "sbin/fs_mgr" }, - { 00640, AID_ROOT, AID_SHELL, 0, "fstab.*" }, - { 00644, AID_ROOT, AID_ROOT, 0, 0 }, -}; - -static inline void fs_config(const char *path, int dir, - unsigned *uid, unsigned *gid, unsigned *mode, uint64_t *capabilities) -{ - const struct fs_path_config *pc; - int plen; - - if (path[0] == '/') { - path++; - } - - pc = dir ? android_dirs : android_files; - plen = strlen(path); - for(; pc->prefix; pc++){ - int len = strlen(pc->prefix); - if (dir) { - if(plen < len) continue; - if(!strncmp(pc->prefix, path, len)) break; - continue; - } - /* If name ends in * then allow partial matches. */ - if (pc->prefix[len -1] == '*') { - if(!strncmp(pc->prefix, path, len - 1)) break; - } else if (plen == len){ - if(!strncmp(pc->prefix, path, len)) break; - } - } - *uid = pc->uid; - *gid = pc->gid; - *mode = (*mode & (~07777)) | pc->mode; - *capabilities = pc->capabilities; - -#if 0 - fprintf(stderr,"< '%s' '%s' %d %d %o >\n", - path, pc->prefix ? pc->prefix : "", *uid, *gid, *mode); -#endif -} -#endif -#endif diff --git a/make_ext4fs.c b/make_ext4fs.c index 7fffd47..b9f653c 100644 --- a/make_ext4fs.c +++ b/make_ext4fs.c @@ -147,7 +147,6 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path } uint64_t capabilities; if (fs_config_func != NULL) { -#ifdef ANDROID unsigned int mode = 0; unsigned int uid = 0; unsigned int gid = 0; @@ -157,9 +156,6 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path dentries[i].uid = uid; dentries[i].gid = gid; dentries[i].capabilities = capabilities; -#else - error("can't set android permissions - built without android support"); -#endif } if (S_ISREG(stat.st_mode)) { diff --git a/make_ext4fs_main.c b/make_ext4fs_main.c index 58853d1..ebfe813 100644 --- a/make_ext4fs_main.c +++ b/make_ext4fs_main.c @@ -25,10 +25,6 @@ #include #endif -#ifdef ANDROID -#include -#endif - #include "make_ext4fs.h" #include "ext4_utils.h" #include "canned_fs_config.h" @@ -64,7 +60,7 @@ int main(int argc, char **argv) time_t fixed_time = -1; FILE* block_list_file = NULL; - while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:T:C:B:fwzJsctv")) != -1) { + while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:T:C:B:fwzJsctv")) != -1) { switch (opt) { case 'l': info.len = parse_num(optarg); @@ -90,15 +86,6 @@ int main(int argc, char **argv) case 'f': force = 1; break; - case 'a': -#ifdef ANDROID - mountpoint = optarg; -#else - fprintf(stderr, "can't set android permissions - built without android support\n"); - usage(argv[0]); - exit(EXIT_FAILURE); -#endif - break; case 'w': wipe = 1; break; -- 2.11.0