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

Commit 77b513dd authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

TOMOYO: Accept manager programs which do not start with / . 



The pathname of /usr/sbin/tomoyo-editpolicy seen from Ubuntu 12.04 Live CD is
squashfs:/usr/sbin/tomoyo-editpolicy rather than /usr/sbin/tomoyo-editpolicy .
Therefore, we need to accept manager programs which do not start with / .

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent fd75815f

security/tomoyo/common.c

+6 −20
Original line number Diff line number Diff line
@@ -850,14 +850,9 @@ static int tomoyo_update_manager_entry(const char *manager, 
		policy_list[TOMOYO_ID_MANAGER],

	};

	int error = is_delete ? -ENOENT : -ENOMEM;

	if (tomoyo_domain_def(manager)) {

		if (!tomoyo_correct_domain(manager))

	if (!tomoyo_correct_domain(manager) &&

	    !tomoyo_correct_word(manager))

		return -EINVAL;

		e.is_domain = true;

	} else {

		if (!tomoyo_correct_path(manager))

			return -EINVAL;

	}

	e.manager = tomoyo_get_name(manager);

	if (e.manager) {

		error = tomoyo_update_policy(&e.head, sizeof(e), &param,
@@ -932,23 +927,14 @@ static bool tomoyo_manager(void) 
		return true;

	if (!tomoyo_manage_by_non_root && (task->cred->uid || task->cred->euid))

		return false;

	list_for_each_entry_rcu(ptr, &tomoyo_kernel_namespace.

				policy_list[TOMOYO_ID_MANAGER], head.list) {

		if (!ptr->head.is_deleted && ptr->is_domain

		    && !tomoyo_pathcmp(domainname, ptr->manager)) {

			found = true;

			break;

		}

	}

	if (found)

		return true;

	exe = tomoyo_get_exe();

	if (!exe)

		return false;

	list_for_each_entry_rcu(ptr, &tomoyo_kernel_namespace.

				policy_list[TOMOYO_ID_MANAGER], head.list) {

		if (!ptr->head.is_deleted && !ptr->is_domain

		    && !strcmp(exe, ptr->manager->name)) {

		if (!ptr->head.is_deleted &&

		    (!tomoyo_pathcmp(domainname, ptr->manager) ||

		     !strcmp(exe, ptr->manager->name))) {

			found = true;

			break;

		}

security/tomoyo/common.h

+0 −1
Original line number Diff line number Diff line
@@ -860,7 +860,6 @@ struct tomoyo_aggregator { 
/* Structure for policy manager. */

struct tomoyo_manager {

	struct tomoyo_acl_head head;

	bool is_domain;  /* True if manager is a domainname. */

	/* A path to program or a domainname. */

	const struct tomoyo_path_info *manager;

};