Merge "libcutils: fs_config.c code compliance" (b501400a) · Commits · e / os / android_system_core

libcutils/fs_config.c

+37 −39

Original line number	Diff line number	Diff line
		@@ -52,13 +52,9 @@ struct fs_path_config_from_file {
		} __attribute__((__aligned__(sizeof(uint64_t))));

		/* My kingdom for <endian.h> */
		static inline uint16_t get2LE(const uint8_t* src)
		{
		return src[0] \| (src[1] << 8);
		}
		static inline uint16_t get2LE(const uint8_t* src) { return src[0] \| (src[1] << 8); }

		static inline uint64_t get8LE(const uint8_t* src)
		{
		static inline uint64_t get8LE(const uint8_t* src) {
		uint32_t low, high;

		low = src[0] \| (src[1] << 8) \| (src[2] << 16) \| (src[3] << 24);
		@@ -75,6 +71,7 @@ static inline uint64_t get8LE(const uint8_t* src)
		*/

		static const struct fs_path_config android_dirs[] = {
		/* clang-format off */
		{ 00770, AID_SYSTEM, AID_CACHE, 0, "cache" },
		{ 00500, AID_ROOT, AID_ROOT, 0, "config" },
		{ 00771, AID_SYSTEM, AID_SYSTEM, 0, "data/app" },
		@@ -104,6 +101,7 @@ static const struct fs_path_config android_dirs[] = {
		{ 00755, AID_ROOT, AID_SHELL, 0, "vendor" },
		{ 00777, AID_ROOT, AID_ROOT, 0, "sdcard" },
		{ 00755, AID_ROOT, AID_ROOT, 0, 0 },
		/* clang-format on */
		};

		/* Rules for files.
		@@ -116,6 +114,7 @@ static const char conf_dir[] = "/system/etc/fs_config_dirs";
		static const char conf_file[] = "/system/etc/fs_config_files";

		static const struct fs_path_config android_files[] = {
		/* clang-format off */
		{ 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" },
		@@ -139,7 +138,8 @@ static const struct fs_path_config android_files[] = {
		{ 04750, AID_ROOT, AID_SHELL, 0, "system/xbin/su" },
		{ 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/procmem" },

		/* the following files have enhanced capabilities and ARE included in user builds. */
		/* the following files have enhanced capabilities and ARE included
		* in user builds. */
		{ 00550, AID_LOGD, AID_LOGD, CAP_MASK_LONG(CAP_SYSLOG) \|
		CAP_MASK_LONG(CAP_AUDIT_CONTROL) \|
		CAP_MASK_LONG(CAP_SETGID),
		@@ -167,7 +167,8 @@ static const struct fs_path_config android_files[] = {
		{ 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN),
		"vendor/bin/hw/android.hardware.bluetooth@1.0-service" },

		/* A non-privileged zygote that spawns isolated processes for web rendering. */
		/* A non-privileged zygote that spawns
		* isolated processes for web rendering. */
		{ 0750, AID_ROOT, AID_ROOT, CAP_MASK_LONG(CAP_SETUID) \|
		CAP_MASK_LONG(CAP_SETGID) \|
		CAP_MASK_LONG(CAP_SETPCAP),
		@@ -203,15 +204,16 @@ static const struct fs_path_config android_files[] = {
		{ 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" },
		{ 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" },
		{ 00644, AID_ROOT, AID_ROOT, 0, 0 },
		/* clang-format on */
		};

		static int fs_config_open(int dir, const char *target_out_path)
		{
		static int fs_config_open(int dir, const char* target_out_path) {
		int fd = -1;

		if (target_out_path && *target_out_path) {
		/* target_out_path is the path to the directory holding content of system partition
		but as we cannot guaranty it ends with '/system' we need this below skip_len logic */
		/* target_out_path is the path to the directory holding content of
		* system partition but as we cannot guaranty it ends with '/system'
		* we need this below skip_len logic */
		char* name = NULL;
		int target_out_path_len = strlen(target_out_path);
		int skip_len = strlen("/system");
		@@ -230,9 +232,7 @@ static int fs_config_open(int dir, const char *target_out_path)
		return fd;
		}

		static bool fs_config_cmp(bool dir, const char *prefix, size_t len,
		const char *path, size_t plen)
		{
		static bool fs_config_cmp(bool dir, const char* prefix, size_t len, const char* path, size_t plen) {
		if (dir) {
		if (plen < len) {
		return false;
		@@ -249,11 +249,11 @@ static bool fs_config_cmp(bool dir, const char *prefix, size_t len,
		return !strncmp(prefix, path, len);
		}

		void fs_config(const char path, int dir, const char target_out_path,
		unsigned uid, unsigned gid, unsigned mode, uint64_t capabilities)
		{
		void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid,
		unsigned* mode, uint64_t* capabilities) {
		const struct fs_path_config* pc;
		int fd, plen;
		size_t plen;
		int fd;

		if (path[0] == '/') {
		path++;
		@@ -303,8 +303,7 @@ void fs_config(const char path, int dir, const char target_out_path,
		close(fd);
		}

		pc = dir ? android_dirs : android_files;
		for(; pc->prefix; pc++){
		for (pc = dir ? android_dirs : android_files; pc->prefix; pc++) {
		if (fs_config_cmp(dir, pc->prefix, strlen(pc->prefix), path, plen)) {
		break;
		}
		@@ -315,8 +314,7 @@ void fs_config(const char path, int dir, const char target_out_path,
		*capabilities = pc->capabilities;
		}

		ssize_t fs_config_generate(char buffer, size_t length, const struct fs_path_config pc)
		{
		ssize_t fs_config_generate(char* buffer, size_t length, const struct fs_path_config* pc) {
		struct fs_path_config_from_file* p = (struct fs_path_config_from_file*)buffer;
		size_t len = ALIGN(sizeof(*p) + strlen(pc->prefix) + 1, sizeof(uint64_t));