am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux." (46e89912) · Commits · e / os / android_system_core

run-as/package.c

+21 −4

Original line number	Diff line number	Diff line
		@@ -47,15 +47,18 @@
		/* Copy 'srclen' string bytes from 'src' into buffer 'dst' of size 'dstlen'
		* This function always zero-terminate the destination buffer unless
		* 'dstlen' is 0, even in case of overflow.
		* Returns a pointer into the src string, leaving off where the copy
		* has stopped. The copy will stop when dstlen, srclen or a null
		* character on src has been reached.
		*/
		static void
		static const char*
		string_copy(char* dst, size_t dstlen, const char* src, size_t srclen)
		{
		const char* srcend = src + srclen;
		const char* dstend = dst + dstlen;

		if (dstlen == 0)
		return;
		return src;

		dstend--; /* make room for terminating zero */

		@@ -63,6 +66,7 @@ string_copy(char* dst, size_t dstlen, const char* src, size_t srclen)
		dst++ = src++;

		dst = '\0'; / zero-terminate result */
		return src;
		}

		/* Open 'filename' and map it into our address-space.
		@@ -428,6 +432,7 @@ get_package_info(const char* pkgName, PackageInfo *info)
		info->uid = 0;
		info->isDebuggable = 0;
		info->dataDir[0] = '\0';
		info->seinfo[0] = '\0';

		buffer = map_file(PACKAGES_LIST_FILE, &buffer_len);
		if (buffer == NULL)
		@@ -438,13 +443,14 @@ get_package_info(const char* pkgName, PackageInfo *info)

		/* expect the following format on each line of the control file:
		*
		* <pkgName> <uid> <debugFlag> <dataDir>
		* <pkgName> <uid> <debugFlag> <dataDir> <seinfo>
		*
		* where:
		* <pkgName> is the package's name
		* <uid> is the application-specific user Id (decimal)
		* <debugFlag> is 1 if the package is debuggable, or 0 otherwise
		* <dataDir> is the path to the package's data directory (e.g. /data/data/com.example.foo)
		* <seinfo> is the seinfo label associated with the package
		*
		* The file is generated in com.android.server.PackageManagerService.Settings.writeLP()
		*/
		@@ -500,7 +506,18 @@ get_package_info(const char* pkgName, PackageInfo *info)
		if (q == p)
		goto BAD_FORMAT;

		string_copy(info->dataDir, sizeof info->dataDir, p, q - p);
		p = string_copy(info->dataDir, sizeof info->dataDir, p, q - p);

		/* skip spaces */
		if (parse_spaces(&p, end) < 0)
		goto BAD_FORMAT;

		/* fifth field is the seinfo string */
		q = skip_non_spaces(p, end);
		if (q == p)
		goto BAD_FORMAT;

		string_copy(info->seinfo, sizeof info->seinfo, p, q - p);

		/* Ignore the rest */
		result = 0;

run-as/package.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ typedef struct {
		uid_t uid;
		char isDebuggable;
		char dataDir[PATH_MAX];
		char seinfo[PATH_MAX];
		} PackageInfo;

		/* see documentation in package.c for these functiosn */

run-as/run-as.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ int main(int argc, char **argv)
		return 1;
		}

		if (selinux_android_setcontext(uid, 0, NULL, pkgname) < 0) {
		if (selinux_android_setcontext(uid, 0, info.seinfo, pkgname) < 0) {
		panic("Could not set SELinux security context: %s\n", strerror(errno));
		return 1;
		}