Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26288202 authored Feb 07, 2014 by Stephen Smalley

Convert all selinux_android_restorecon and _setfilecon calls to new API.

libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

parent 74be0f7b

cmds/dumpstate/utils.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ const char *dump_traces() {
		if (!mkdir(anr_traces_dir, 0775)) {
		chown(anr_traces_dir, AID_SYSTEM, AID_SYSTEM);
		chmod(anr_traces_dir, 0775);
		if (selinux_android_restorecon(anr_traces_dir) == -1) {
		if (selinux_android_restorecon(anr_traces_dir, 0) == -1) {
		fprintf(stderr, "restorecon failed for %s: %s\n", anr_traces_dir, strerror(errno));
		}
		} else if (errno != EEXIST) {

cmds/installd/commands.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ int install(const char pkgname, uid_t uid, gid_t gid, const char seinfo)
		return -1;
		}

		if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {
		if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {
		ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
		unlink(libsymlink);
		unlink(pkgdir);
		@@ -245,7 +245,7 @@ int make_user_data(const char pkgname, uid_t uid, userid_t userid, const char
		return -1;
		}

		if (selinux_android_setfilecon2(pkgdir, pkgname, seinfo, uid) < 0) {
		if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {
		ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
		unlink(libsymlink);
		unlink(pkgdir);

cmds/installd/installd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -392,7 +392,7 @@ int initialize_directories() {
		goto fail;
		}

		if (selinux_android_restorecon(android_media_dir.path)) {
		if (selinux_android_restorecon(android_media_dir.path, 0)) {
		goto fail;
		}