2 files changed, 6 insertions, 21 deletions

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 8656b16eef7b..2e0f12c62938 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -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))
-                        return -EINVAL;
-                e.is_domain = true;
-        } else {
-                if (!tomoyo_correct_path(manager))
-                        return -EINVAL;
-        }
+        if (!tomoyo_correct_domain(manager) &&
+            !tomoyo_correct_word(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;
                 }
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h
index 30fd98369700..75e4dc1c02a0 100644
--- a/security/tomoyo/common.h
+++ b/security/tomoyo/common.h
@@ -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;
 };