]> bbs.cooldavid.org Git - net-next-2.6.git/blobdiff - security/tomoyo/domain.c
TOMOYO: Aggregate reader functions.
[net-next-2.6.git] / security / tomoyo / domain.c
index fe621af46c2e46b2d6054a2f159a2f8f51bcc327..038071a8a3d3c42c70a97800753328e2b22205ed 100644 (file)
@@ -109,46 +109,30 @@ int tomoyo_update_domain(struct tomoyo_acl_info *new_entry, const int size,
        return error;
 }
 
-/*
- * tomoyo_domain_list is used for holding list of domains.
- * The ->acl_info_list of "struct tomoyo_domain_info" is used for holding
- * permissions (e.g. "allow_read /lib/libc-2.5.so") given to each domain.
- *
- * An entry is added by
- *
- * # ( echo "<kernel>"; echo "allow_execute /sbin/init" ) > \
- *                                  /sys/kernel/security/tomoyo/domain_policy
- *
- * and is deleted by
- *
- * # ( echo "<kernel>"; echo "delete allow_execute /sbin/init" ) > \
- *                                  /sys/kernel/security/tomoyo/domain_policy
- *
- * and all entries are retrieved by
- *
- * # cat /sys/kernel/security/tomoyo/domain_policy
- *
- * A domain is added by
- *
- * # echo "<kernel>" > /sys/kernel/security/tomoyo/domain_policy
- *
- * and is deleted by
- *
- * # echo "delete <kernel>" > /sys/kernel/security/tomoyo/domain_policy
- *
- * and all domains are retrieved by
- *
- * # grep '^<kernel>' /sys/kernel/security/tomoyo/domain_policy
- *
- * Normally, a domainname is monotonically getting longer because a domainname
- * which the process will belong to if an execve() operation succeeds is
- * defined as a concatenation of "current domainname" + "pathname passed to
- * execve()".
- * See tomoyo_domain_initializer_list and tomoyo_domain_keeper_list for
- * exceptions.
- */
+void tomoyo_check_acl(struct tomoyo_request_info *r,
+                     bool (*check_entry) (const struct tomoyo_request_info *,
+                                          const struct tomoyo_acl_info *))
+{
+       const struct tomoyo_domain_info *domain = r->domain;
+       struct tomoyo_acl_info *ptr;
+
+       list_for_each_entry_rcu(ptr, &domain->acl_info_list, list) {
+               if (ptr->is_deleted || ptr->type != r->param_type)
+                       continue;
+               if (check_entry(r, ptr)) {
+                       r->granted = true;
+                       return;
+               }
+       }
+       r->granted = false;
+}
+
+/* The list for "struct tomoyo_domain_info". */
 LIST_HEAD(tomoyo_domain_list);
 
+struct list_head tomoyo_policy_list[TOMOYO_MAX_POLICY];
+struct list_head tomoyo_group_list[TOMOYO_MAX_GROUP];
+
 /**
  * tomoyo_get_last_name - Get last component of a domainname.
  *
@@ -166,44 +150,6 @@ const char *tomoyo_get_last_name(const struct tomoyo_domain_info *domain)
        return cp0;
 }
 
-/*
- * tomoyo_domain_initializer_list is used for holding list of programs which
- * triggers reinitialization of domainname. Normally, a domainname is
- * monotonically getting longer. But sometimes, we restart daemon programs.
- * It would be convenient for us that "a daemon started upon system boot" and
- * "the daemon restarted from console" belong to the same domain. Thus, TOMOYO
- * provides a way to shorten domainnames.
- *
- * An entry is added by
- *
- * # echo 'initialize_domain /usr/sbin/httpd' > \
- *                               /sys/kernel/security/tomoyo/exception_policy
- *
- * and is deleted by
- *
- * # echo 'delete initialize_domain /usr/sbin/httpd' > \
- *                               /sys/kernel/security/tomoyo/exception_policy
- *
- * and all entries are retrieved by
- *
- * # grep ^initialize_domain /sys/kernel/security/tomoyo/exception_policy
- *
- * In the example above, /usr/sbin/httpd will belong to
- * "<kernel> /usr/sbin/httpd" domain.
- *
- * You may specify a domainname using "from" keyword.
- * "initialize_domain /usr/sbin/httpd from <kernel> /etc/rc.d/init.d/httpd"
- * will cause "/usr/sbin/httpd" executed from "<kernel> /etc/rc.d/init.d/httpd"
- * domain to belong to "<kernel> /usr/sbin/httpd" domain.
- *
- * You may add "no_" prefix to "initialize_domain".
- * "initialize_domain /usr/sbin/httpd" and
- * "no_initialize_domain /usr/sbin/httpd from <kernel> /etc/rc.d/init.d/httpd"
- * will cause "/usr/sbin/httpd" to belong to "<kernel> /usr/sbin/httpd" domain
- * unless executed from "<kernel> /etc/rc.d/init.d/httpd" domain.
- */
-LIST_HEAD(tomoyo_domain_initializer_list);
-
 static bool tomoyo_same_domain_initializer_entry(const struct tomoyo_acl_head *
                                                 a,
                                                 const struct tomoyo_acl_head *
@@ -238,13 +184,13 @@ static int tomoyo_update_domain_initializer_entry(const char *domainname,
        struct tomoyo_domain_initializer_entry e = { .is_not = is_not };
        int error = is_delete ? -ENOENT : -ENOMEM;
 
-       if (!tomoyo_is_correct_path(program))
+       if (!tomoyo_correct_path(program))
                return -EINVAL;
        if (domainname) {
-               if (!tomoyo_is_domain_def(domainname) &&
-                   tomoyo_is_correct_path(domainname))
+               if (!tomoyo_domain_def(domainname) &&
+                   tomoyo_correct_path(domainname))
                        e.is_last_name = true;
-               else if (!tomoyo_is_correct_domain(domainname))
+               else if (!tomoyo_correct_domain(domainname))
                        return -EINVAL;
                e.domainname = tomoyo_get_name(domainname);
                if (!e.domainname)
@@ -254,7 +200,8 @@ static int tomoyo_update_domain_initializer_entry(const char *domainname,
        if (!e.program)
                goto out;
        error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
-                                    &tomoyo_domain_initializer_list,
+                                    &tomoyo_policy_list
+                                    [TOMOYO_ID_DOMAIN_INITIALIZER],
                                     tomoyo_same_domain_initializer_entry);
  out:
        tomoyo_put_name(e.domainname);
@@ -262,45 +209,6 @@ static int tomoyo_update_domain_initializer_entry(const char *domainname,
        return error;
 }
 
-/**
- * tomoyo_read_domain_initializer_policy - Read "struct tomoyo_domain_initializer_entry" list.
- *
- * @head: Pointer to "struct tomoyo_io_buffer".
- *
- * Returns true on success, false otherwise.
- *
- * Caller holds tomoyo_read_lock().
- */
-bool tomoyo_read_domain_initializer_policy(struct tomoyo_io_buffer *head)
-{
-       struct list_head *pos;
-       bool done = true;
-
-       list_for_each_cookie(pos, head->read_var2,
-                            &tomoyo_domain_initializer_list) {
-               const char *no;
-               const char *from = "";
-               const char *domain = "";
-               struct tomoyo_domain_initializer_entry *ptr;
-               ptr = list_entry(pos, struct tomoyo_domain_initializer_entry,
-                                head.list);
-               if (ptr->head.is_deleted)
-                       continue;
-               no = ptr->is_not ? "no_" : "";
-               if (ptr->domainname) {
-                       from = " from ";
-                       domain = ptr->domainname->name;
-               }
-               done = tomoyo_io_printf(head,
-                                       "%s" TOMOYO_KEYWORD_INITIALIZE_DOMAIN
-                                       "%s%s%s\n", no, ptr->program->name,
-                                       from, domain);
-               if (!done)
-                       break;
-       }
-       return done;
-}
-
 /**
  * tomoyo_write_domain_initializer_policy - Write "struct tomoyo_domain_initializer_entry" list.
  *
@@ -328,7 +236,7 @@ int tomoyo_write_domain_initializer_policy(char *data, const bool is_not,
 }
 
 /**
- * tomoyo_is_domain_initializer - Check whether the given program causes domainname reinitialization.
+ * tomoyo_domain_initializer - Check whether the given program causes domainname reinitialization.
  *
  * @domainname: The name of domain.
  * @program:    The name of program.
@@ -339,7 +247,7 @@ int tomoyo_write_domain_initializer_policy(char *data, const bool is_not,
  *
  * Caller holds tomoyo_read_lock().
  */
-static bool tomoyo_is_domain_initializer(const struct tomoyo_path_info *
+static bool tomoyo_domain_initializer(const struct tomoyo_path_info *
                                         domainname,
                                         const struct tomoyo_path_info *program,
                                         const struct tomoyo_path_info *
@@ -348,8 +256,8 @@ static bool tomoyo_is_domain_initializer(const struct tomoyo_path_info *
        struct tomoyo_domain_initializer_entry *ptr;
        bool flag = false;
 
-       list_for_each_entry_rcu(ptr, &tomoyo_domain_initializer_list,
-                               head.list) {
+       list_for_each_entry_rcu(ptr, &tomoyo_policy_list
+                               [TOMOYO_ID_DOMAIN_INITIALIZER], head.list) {
                if (ptr->head.is_deleted)
                        continue;
                if (ptr->domainname) {
@@ -372,46 +280,6 @@ static bool tomoyo_is_domain_initializer(const struct tomoyo_path_info *
        return flag;
 }
 
-/*
- * tomoyo_domain_keeper_list is used for holding list of domainnames which
- * suppresses domain transition. Normally, a domainname is monotonically
- * getting longer. But sometimes, we want to suppress domain transition.
- * It would be convenient for us that programs executed from a login session
- * belong to the same domain. Thus, TOMOYO provides a way to suppress domain
- * transition.
- *
- * An entry is added by
- *
- * # echo 'keep_domain <kernel> /usr/sbin/sshd /bin/bash' > \
- *                              /sys/kernel/security/tomoyo/exception_policy
- *
- * and is deleted by
- *
- * # echo 'delete keep_domain <kernel> /usr/sbin/sshd /bin/bash' > \
- *                              /sys/kernel/security/tomoyo/exception_policy
- *
- * and all entries are retrieved by
- *
- * # grep ^keep_domain /sys/kernel/security/tomoyo/exception_policy
- *
- * In the example above, any process which belongs to
- * "<kernel> /usr/sbin/sshd /bin/bash" domain will remain in that domain,
- * unless explicitly specified by "initialize_domain" or "no_keep_domain".
- *
- * You may specify a program using "from" keyword.
- * "keep_domain /bin/pwd from <kernel> /usr/sbin/sshd /bin/bash"
- * will cause "/bin/pwd" executed from "<kernel> /usr/sbin/sshd /bin/bash"
- * domain to remain in "<kernel> /usr/sbin/sshd /bin/bash" domain.
- *
- * You may add "no_" prefix to "keep_domain".
- * "keep_domain <kernel> /usr/sbin/sshd /bin/bash" and
- * "no_keep_domain /usr/bin/passwd from <kernel> /usr/sbin/sshd /bin/bash" will
- * cause "/usr/bin/passwd" to belong to
- * "<kernel> /usr/sbin/sshd /bin/bash /usr/bin/passwd" domain, unless
- * explicitly specified by "initialize_domain".
- */
-LIST_HEAD(tomoyo_domain_keeper_list);
-
 static bool tomoyo_same_domain_keeper_entry(const struct tomoyo_acl_head *a,
                                            const struct tomoyo_acl_head *b)
 {
@@ -444,13 +312,13 @@ static int tomoyo_update_domain_keeper_entry(const char *domainname,
        struct tomoyo_domain_keeper_entry e = { .is_not = is_not };
        int error = is_delete ? -ENOENT : -ENOMEM;
 
-       if (!tomoyo_is_domain_def(domainname) &&
-           tomoyo_is_correct_path(domainname))
+       if (!tomoyo_domain_def(domainname) &&
+           tomoyo_correct_path(domainname))
                e.is_last_name = true;
-       else if (!tomoyo_is_correct_domain(domainname))
+       else if (!tomoyo_correct_domain(domainname))
                return -EINVAL;
        if (program) {
-               if (!tomoyo_is_correct_path(program))
+               if (!tomoyo_correct_path(program))
                        return -EINVAL;
                e.program = tomoyo_get_name(program);
                if (!e.program)
@@ -460,7 +328,8 @@ static int tomoyo_update_domain_keeper_entry(const char *domainname,
        if (!e.domainname)
                goto out;
        error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
-                                    &tomoyo_domain_keeper_list,
+                                    &tomoyo_policy_list
+                                    [TOMOYO_ID_DOMAIN_KEEPER],
                                     tomoyo_same_domain_keeper_entry);
  out:
        tomoyo_put_name(e.domainname);
@@ -491,47 +360,7 @@ int tomoyo_write_domain_keeper_policy(char *data, const bool is_not,
 }
 
 /**
- * tomoyo_read_domain_keeper_policy - Read "struct tomoyo_domain_keeper_entry" list.
- *
- * @head: Pointer to "struct tomoyo_io_buffer".
- *
- * Returns true on success, false otherwise.
- *
- * Caller holds tomoyo_read_lock().
- */
-bool tomoyo_read_domain_keeper_policy(struct tomoyo_io_buffer *head)
-{
-       struct list_head *pos;
-       bool done = true;
-
-       list_for_each_cookie(pos, head->read_var2,
-                            &tomoyo_domain_keeper_list) {
-               struct tomoyo_domain_keeper_entry *ptr;
-               const char *no;
-               const char *from = "";
-               const char *program = "";
-
-               ptr = list_entry(pos, struct tomoyo_domain_keeper_entry,
-                                head.list);
-               if (ptr->head.is_deleted)
-                       continue;
-               no = ptr->is_not ? "no_" : "";
-               if (ptr->program) {
-                       from = " from ";
-                       program = ptr->program->name;
-               }
-               done = tomoyo_io_printf(head,
-                                       "%s" TOMOYO_KEYWORD_KEEP_DOMAIN
-                                       "%s%s%s\n", no, program, from,
-                                       ptr->domainname->name);
-               if (!done)
-                       break;
-       }
-       return done;
-}
-
-/**
- * tomoyo_is_domain_keeper - Check whether the given program causes domain transition suppression.
+ * tomoyo_domain_keeper - Check whether the given program causes domain transition suppression.
  *
  * @domainname: The name of domain.
  * @program:    The name of program.
@@ -542,14 +371,16 @@ bool tomoyo_read_domain_keeper_policy(struct tomoyo_io_buffer *head)
  *
  * Caller holds tomoyo_read_lock().
  */
-static bool tomoyo_is_domain_keeper(const struct tomoyo_path_info *domainname,
+static bool tomoyo_domain_keeper(const struct tomoyo_path_info *domainname,
                                    const struct tomoyo_path_info *program,
                                    const struct tomoyo_path_info *last_name)
 {
        struct tomoyo_domain_keeper_entry *ptr;
        bool flag = false;
 
-       list_for_each_entry_rcu(ptr, &tomoyo_domain_keeper_list, head.list) {
+       list_for_each_entry_rcu(ptr,
+                               &tomoyo_policy_list[TOMOYO_ID_DOMAIN_KEEPER],
+                               head.list) {
                if (ptr->head.is_deleted)
                        continue;
                if (!ptr->is_last_name) {
@@ -570,35 +401,6 @@ static bool tomoyo_is_domain_keeper(const struct tomoyo_path_info *domainname,
        return flag;
 }
 
-/*
- * tomoyo_aggregator_list is used for holding list of rewrite table for
- * execve() request. Some programs provides similar functionality. This keyword
- * allows users to aggregate such programs.
- *
- * Entries are added by
- *
- * # echo 'aggregator /usr/bin/vi /./editor' > \
- *                            /sys/kernel/security/tomoyo/exception_policy
- * # echo 'aggregator /usr/bin/emacs /./editor' > \
- *                            /sys/kernel/security/tomoyo/exception_policy
- *
- * and are deleted by
- *
- * # echo 'delete aggregator /usr/bin/vi /./editor' > \
- *                            /sys/kernel/security/tomoyo/exception_policy
- * # echo 'delete aggregator /usr/bin/emacs /./editor' > \
- *                            /sys/kernel/security/tomoyo/exception_policy
- *
- * and all entries are retrieved by
- *
- * # grep ^aggregator /sys/kernel/security/tomoyo/exception_policy
- *
- * In the example above, if /usr/bin/vi or /usr/bin/emacs are executed,
- * permission is checked for /./editor and domainname which the current process
- * will belong to after execve() succeeds is calculated using /./editor .
- */
-LIST_HEAD(tomoyo_aggregator_list);
-
 static bool tomoyo_same_aggregator_entry(const struct tomoyo_acl_head *a,
                                         const struct tomoyo_acl_head *b)
 {
@@ -628,8 +430,8 @@ static int tomoyo_update_aggregator_entry(const char *original_name,
        struct tomoyo_aggregator_entry e = { };
        int error = is_delete ? -ENOENT : -ENOMEM;
 
-       if (!tomoyo_is_correct_path(original_name) ||
-           !tomoyo_is_correct_path(aggregated_name))
+       if (!tomoyo_correct_path(original_name) ||
+           !tomoyo_correct_path(aggregated_name))
                return -EINVAL;
        e.original_name = tomoyo_get_name(original_name);
        e.aggregated_name = tomoyo_get_name(aggregated_name);
@@ -637,7 +439,7 @@ static int tomoyo_update_aggregator_entry(const char *original_name,
            e.aggregated_name->is_patterned) /* No patterns allowed. */
                goto out;
        error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
-                                    &tomoyo_aggregator_list,
+                                    &tomoyo_policy_list[TOMOYO_ID_AGGREGATOR],
                                     tomoyo_same_aggregator_entry);
  out:
        tomoyo_put_name(e.original_name);
@@ -645,36 +447,6 @@ static int tomoyo_update_aggregator_entry(const char *original_name,
        return error;
 }
 
-/**
- * tomoyo_read_aggregator_policy - Read "struct tomoyo_aggregator_entry" list.
- *
- * @head: Pointer to "struct tomoyo_io_buffer".
- *
- * Returns true on success, false otherwise.
- *
- * Caller holds tomoyo_read_lock().
- */
-bool tomoyo_read_aggregator_policy(struct tomoyo_io_buffer *head)
-{
-       struct list_head *pos;
-       bool done = true;
-
-       list_for_each_cookie(pos, head->read_var2, &tomoyo_aggregator_list) {
-               struct tomoyo_aggregator_entry *ptr;
-
-               ptr = list_entry(pos, struct tomoyo_aggregator_entry,
-                                head.list);
-               if (ptr->head.is_deleted)
-                       continue;
-               done = tomoyo_io_printf(head, TOMOYO_KEYWORD_AGGREGATOR
-                                       "%s %s\n", ptr->original_name->name,
-                                       ptr->aggregated_name->name);
-               if (!done)
-                       break;
-       }
-       return done;
-}
-
 /**
  * tomoyo_write_aggregator_policy - Write "struct tomoyo_aggregator_entry" list.
  *
@@ -695,38 +467,6 @@ int tomoyo_write_aggregator_policy(char *data, const bool is_delete)
        return tomoyo_update_aggregator_entry(data, cp, is_delete);
 }
 
-/*
- * tomoyo_alias_list is used for holding list of symlink's pathnames which are
- * allowed to be passed to an execve() request. Normally, the domainname which
- * the current process will belong to after execve() succeeds is calculated
- * using dereferenced pathnames. But some programs behave differently depending
- * on the name passed to argv[0]. For busybox, calculating domainname using
- * dereferenced pathnames will cause all programs in the busybox to belong to
- * the same domain. Thus, TOMOYO provides a way to allow use of symlink's
- * pathname for checking execve()'s permission and calculating domainname which
- * the current process will belong to after execve() succeeds.
- *
- * An entry is added by
- *
- * # echo 'alias /bin/busybox /bin/cat' > \
- *                            /sys/kernel/security/tomoyo/exception_policy
- *
- * and is deleted by
- *
- * # echo 'delete alias /bin/busybox /bin/cat' > \
- *                            /sys/kernel/security/tomoyo/exception_policy
- *
- * and all entries are retrieved by
- *
- * # grep ^alias /sys/kernel/security/tomoyo/exception_policy
- *
- * In the example above, if /bin/cat is a symlink to /bin/busybox and execution
- * of /bin/cat is requested, permission is checked for /bin/cat rather than
- * /bin/busybox and domainname which the current process will belong to after
- * execve() succeeds is calculated using /bin/cat rather than /bin/busybox .
- */
-LIST_HEAD(tomoyo_alias_list);
-
 static bool tomoyo_same_alias_entry(const struct tomoyo_acl_head *a,
                                    const struct tomoyo_acl_head *b)
 {
@@ -756,8 +496,8 @@ static int tomoyo_update_alias_entry(const char *original_name,
        struct tomoyo_alias_entry e = { };
        int error = is_delete ? -ENOENT : -ENOMEM;
 
-       if (!tomoyo_is_correct_path(original_name) ||
-           !tomoyo_is_correct_path(aliased_name))
+       if (!tomoyo_correct_path(original_name) ||
+           !tomoyo_correct_path(aliased_name))
                return -EINVAL;
        e.original_name = tomoyo_get_name(original_name);
        e.aliased_name = tomoyo_get_name(aliased_name);
@@ -765,7 +505,7 @@ static int tomoyo_update_alias_entry(const char *original_name,
            e.original_name->is_patterned || e.aliased_name->is_patterned)
                goto out; /* No patterns allowed. */
        error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
-                                    &tomoyo_alias_list,
+                                    &tomoyo_policy_list[TOMOYO_ID_ALIAS],
                                     tomoyo_same_alias_entry);
  out:
        tomoyo_put_name(e.original_name);
@@ -773,35 +513,6 @@ static int tomoyo_update_alias_entry(const char *original_name,
        return error;
 }
 
-/**
- * tomoyo_read_alias_policy - Read "struct tomoyo_alias_entry" list.
- *
- * @head: Pointer to "struct tomoyo_io_buffer".
- *
- * Returns true on success, false otherwise.
- *
- * Caller holds tomoyo_read_lock().
- */
-bool tomoyo_read_alias_policy(struct tomoyo_io_buffer *head)
-{
-       struct list_head *pos;
-       bool done = true;
-
-       list_for_each_cookie(pos, head->read_var2, &tomoyo_alias_list) {
-               struct tomoyo_alias_entry *ptr;
-
-               ptr = list_entry(pos, struct tomoyo_alias_entry, head.list);
-               if (ptr->head.is_deleted)
-                       continue;
-               done = tomoyo_io_printf(head, TOMOYO_KEYWORD_ALIAS "%s %s\n",
-                                       ptr->original_name->name,
-                                       ptr->aliased_name->name);
-               if (!done)
-                       break;
-       }
-       return done;
-}
-
 /**
  * tomoyo_write_alias_policy - Write "struct tomoyo_alias_entry" list.
  *
@@ -841,7 +552,7 @@ struct tomoyo_domain_info *tomoyo_find_or_assign_new_domain(const char *
        const struct tomoyo_path_info *saved_domainname;
        bool found = false;
 
-       if (!tomoyo_is_correct_domain(domainname))
+       if (!tomoyo_correct_domain(domainname))
                return NULL;
        saved_domainname = tomoyo_get_name(domainname);
        if (!saved_domainname)
@@ -928,7 +639,9 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
        if (tomoyo_pathcmp(&rn, &sn)) {
                struct tomoyo_alias_entry *ptr;
                /* Is this program allowed to be called via symbolic links? */
-               list_for_each_entry_rcu(ptr, &tomoyo_alias_list, head.list) {
+               list_for_each_entry_rcu(ptr,
+                                       &tomoyo_policy_list[TOMOYO_ID_ALIAS],
+                                       head.list) {
                        if (ptr->head.is_deleted ||
                            tomoyo_pathcmp(&rn, ptr->original_name) ||
                            tomoyo_pathcmp(&sn, ptr->aliased_name))
@@ -944,8 +657,8 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
        /* Check 'aggregator' directive. */
        {
                struct tomoyo_aggregator_entry *ptr;
-               list_for_each_entry_rcu(ptr, &tomoyo_aggregator_list,
-                                       head.list) {
+               list_for_each_entry_rcu(ptr, &tomoyo_policy_list
+                                       [TOMOYO_ID_AGGREGATOR], head.list) {
                        if (ptr->head.is_deleted ||
                            !tomoyo_path_matches_pattern(&rn,
                                                         ptr->original_name))
@@ -960,13 +673,13 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
        }
 
        /* Check execute permission. */
-       retval = tomoyo_check_exec_perm(&r, &rn);
+       retval = tomoyo_path_permission(&r, TOMOYO_TYPE_EXECUTE, &rn);
        if (retval == TOMOYO_RETRY_REQUEST)
                goto retry;
        if (retval < 0)
                goto out;
 
-       if (tomoyo_is_domain_initializer(old_domain->domainname, &rn, &ln)) {
+       if (tomoyo_domain_initializer(old_domain->domainname, &rn, &ln)) {
                /* Transit to the child of tomoyo_kernel_domain domain. */
                snprintf(tmp, TOMOYO_EXEC_TMPSIZE - 1,
                         TOMOYO_ROOT_NAME " " "%s", rn.name);
@@ -978,7 +691,7 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
                 * initializers because they might start before /sbin/init.
                 */
                domain = old_domain;
-       } else if (tomoyo_is_domain_keeper(old_domain->domainname, &rn, &ln)) {
+       } else if (tomoyo_domain_keeper(old_domain->domainname, &rn, &ln)) {
                /* Keep current domain. */
                domain = old_domain;
        } else {