Merge "service_manager.c: remove is_selinux_enabled calls" am: fce768d017 am: 4646e4c581 (01fbe799) · Commits · e / os / platform_frameworks_native

cmds/servicemanager/service_manager.c

+7 −19

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ int str16eq(const uint16_t a, const char b)
		return 1;
		}

		static int selinux_enabled;
		static char *service_manager_context;
		static struct selabel_handle* sehandle;

		@@ -89,10 +88,6 @@ static bool check_mac_perms(pid_t spid, uid_t uid, const char *tctx, const char

		static bool check_mac_perms_from_getcon(pid_t spid, uid_t uid, const char *perm)
		{
		if (selinux_enabled <= 0) {
		return true;
		}

		return check_mac_perms(spid, uid, service_manager_context, perm, NULL);
		}

		@@ -101,10 +96,6 @@ static bool check_mac_perms_from_lookup(pid_t spid, uid_t uid, const char *perm,
		bool allowed;
		char *tctx = NULL;

		if (selinux_enabled <= 0) {
		return true;
		}

		if (!sehandle) {
		ALOGE("SELinux: Failed to find sehandle. Aborting service_manager.\n");
		abort();
		@@ -384,11 +375,9 @@ int main()
		return -1;
		}

		selinux_enabled = is_selinux_enabled();
		sehandle = selinux_android_service_context_handle();
		selinux_status_open(true);

		if (selinux_enabled > 0) {
		if (sehandle == NULL) {
		ALOGE("SELinux: Failed to acquire sehandle. Aborting.\n");
		abort();
		@@ -398,7 +387,6 @@ int main()
		ALOGE("SELinux: Failed to acquire service_manager context. Aborting.\n");
		abort();
		}
		}

		union selinux_callback cb;
		cb.func_audit = audit_callback;