Merge "service_manager.c: remove is_selinux_enabled calls" (fce768d0) · Commits · e / os / android_frameworks_native

cmds/servicemanager/service_manager.c

+7 −19

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

	static int selinux_enabled;
	static char *service_manager_context;		static char *service_manager_context;
	static struct selabel_handle* sehandle;		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)		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);		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;		bool allowed;
	char *tctx = NULL;		char *tctx = NULL;

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

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

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

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

	union selinux_callback cb;		union selinux_callback cb;
	cb.func_audit = audit_callback;		cb.func_audit = audit_callback;