1 files changed, 427 insertions, 203 deletions

diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index 35388408e47..cd0f92d88bb 100644
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -1,9 +1,7 @@
 /*
  * security/tomoyo/domain.c
  *
- * Domain transition functions for TOMOYO.
- *
- * Copyright (C) 2005-2010  NTT DATA CORPORATION
+ * Copyright (C) 2005-2011  NTT DATA CORPORATION
  */
 
 #include "common.h"
@@ -20,8 +18,7 @@ struct tomoyo_domain_info tomoyo_kernel_domain;
  *
  * @new_entry:       Pointer to "struct tomoyo_acl_info".
  * @size:            Size of @new_entry in bytes.
- * @is_delete:       True if it is a delete request.
- * @list:            Pointer to "struct list_head".
+ * @param:           Pointer to "struct tomoyo_acl_param".
  * @check_duplicate: Callback function to find duplicated entry.
  *
  * Returns 0 on success, negative value otherwise.
@@ -29,25 +26,26 @@ struct tomoyo_domain_info tomoyo_kernel_domain;
  * Caller holds tomoyo_read_lock().
  */
 int tomoyo_update_policy(struct tomoyo_acl_head *new_entry, const int size,
-                         bool is_delete, struct list_head *list,
+                         struct tomoyo_acl_param *param,
                          bool (*check_duplicate) (const struct tomoyo_acl_head
                                                   *,
                                                   const struct tomoyo_acl_head
                                                   *))
 {
-        int error = is_delete ? -ENOENT : -ENOMEM;
+        int error = param->is_delete ? -ENOENT : -ENOMEM;
         struct tomoyo_acl_head *entry;
+        struct list_head *list = param->list;
 
         if (mutex_lock_interruptible(&tomoyo_policy_lock))
                 return -ENOMEM;
         list_for_each_entry_rcu(entry, list, list) {
                 if (!check_duplicate(entry, new_entry))
                         continue;
-                entry->is_deleted = is_delete;
+                entry->is_deleted = param->is_delete;
                 error = 0;
                 break;
         }
-        if (error && !is_delete) {
+        if (error && !param->is_delete) {
                 entry = tomoyo_commit_ok(new_entry, size);
                 if (entry) {
                         list_add_tail_rcu(&entry->list, list);
@@ -59,12 +57,25 @@ int tomoyo_update_policy(struct tomoyo_acl_head *new_entry, const int size,
 }
 
 /**
+ * tomoyo_same_acl_head - Check for duplicated "struct tomoyo_acl_info" entry.
+ *
+ * @a: Pointer to "struct tomoyo_acl_info".
+ * @b: Pointer to "struct tomoyo_acl_info".
+ *
+ * Returns true if @a == @b, false otherwise.
+ */
+static inline bool tomoyo_same_acl_head(const struct tomoyo_acl_info *a,
+                                        const struct tomoyo_acl_info *b)
+{
+        return a->type == b->type && a->cond == b->cond;
+}
+
+/**
  * tomoyo_update_domain - Update an entry for domain policy.
  *
  * @new_entry:       Pointer to "struct tomoyo_acl_info".
  * @size:            Size of @new_entry in bytes.
- * @is_delete:       True if it is a delete request.
- * @domain:          Pointer to "struct tomoyo_domain_info".
+ * @param:           Pointer to "struct tomoyo_acl_param".
  * @check_duplicate: Callback function to find duplicated entry.
  * @merge_duplicate: Callback function to merge duplicated entry.
  *
@@ -73,7 +84,7 @@ int tomoyo_update_policy(struct tomoyo_acl_head *new_entry, const int size,
  * Caller holds tomoyo_read_lock().
  */
 int tomoyo_update_domain(struct tomoyo_acl_info *new_entry, const int size,
-                         bool is_delete, struct tomoyo_domain_info *domain,
+                         struct tomoyo_acl_param *param,
                          bool (*check_duplicate) (const struct tomoyo_acl_info
                                                   *,
                                                   const struct tomoyo_acl_info
@@ -82,13 +93,21 @@ int tomoyo_update_domain(struct tomoyo_acl_info *new_entry, const int size,
                                                   struct tomoyo_acl_info *,
                                                   const bool))
 {
+        const bool is_delete = param->is_delete;
         int error = is_delete ? -ENOENT : -ENOMEM;
         struct tomoyo_acl_info *entry;
+        struct list_head * const list = param->list;
 
+        if (param->data[0]) {
+                new_entry->cond = tomoyo_get_condition(param);
+                if (!new_entry->cond)
+                        return -EINVAL;
+        }
         if (mutex_lock_interruptible(&tomoyo_policy_lock))
-                return error;
-        list_for_each_entry_rcu(entry, &domain->acl_info_list, list) {
-                if (!check_duplicate(entry, new_entry))
+                goto out;
+        list_for_each_entry_rcu(entry, list, list) {
+                if (!tomoyo_same_acl_head(entry, new_entry) ||
+                    !check_duplicate(entry, new_entry))
                         continue;
                 if (merge_duplicate)
                         entry->is_deleted = merge_duplicate(entry, new_entry,
@@ -101,28 +120,50 @@ int tomoyo_update_domain(struct tomoyo_acl_info *new_entry, const int size,
         if (error && !is_delete) {
                 entry = tomoyo_commit_ok(new_entry, size);
                 if (entry) {
-                        list_add_tail_rcu(&entry->list, &domain->acl_info_list);
+                        list_add_tail_rcu(&entry->list, list);
                         error = 0;
                 }
         }
         mutex_unlock(&tomoyo_policy_lock);
+out:
+        tomoyo_put_condition(new_entry->cond);
         return error;
 }
 
+/**
+ * tomoyo_check_acl - Do permission check.
+ *
+ * @r:           Pointer to "struct tomoyo_request_info".
+ * @check_entry: Callback function to check type specific parameters.
+ *
+ * Returns 0 on success, negative value otherwise.
+ *
+ * Caller holds tomoyo_read_lock().
+ */
 void tomoyo_check_acl(struct tomoyo_request_info *r,
                       bool (*check_entry) (struct tomoyo_request_info *,
                                            const struct tomoyo_acl_info *))
 {
         const struct tomoyo_domain_info *domain = r->domain;
         struct tomoyo_acl_info *ptr;
+        bool retried = false;
+        const struct list_head *list = &domain->acl_info_list;
 
-        list_for_each_entry_rcu(ptr, &domain->acl_info_list, list) {
+retry:
+        list_for_each_entry_rcu(ptr, list, list) {
                 if (ptr->is_deleted || ptr->type != r->param_type)
                         continue;
-                if (check_entry(r, ptr)) {
-                        r->granted = true;
-                        return;
-                }
+                if (!check_entry(r, ptr))
+                        continue;
+                if (!tomoyo_condition(r, ptr->cond))
+                        continue;
+                r->granted = true;
+                return;
+        }
+        if (!retried) {
+                retried = true;
+                list = &domain->ns->acl_group[domain->group];
+                goto retry;
         }
         r->granted = false;
 }
@@ -130,24 +171,29 @@ void tomoyo_check_acl(struct tomoyo_request_info *r,
 /* 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_last_word - Get last component of a domainname.
  *
- * @domainname: Domainname to check.
+ * @name: Domainname to check.
  *
  * Returns the last word of @domainname.
  */
 static const char *tomoyo_last_word(const char *name)
 {
-        const char *cp = strrchr(name, ' ');
-        if (cp)
-                return cp + 1;
-        return name;
+        const char *cp = strrchr(name, ' ');
+        if (cp)
+                return cp + 1;
+        return name;
 }
 
+/**
+ * tomoyo_same_transition_control - Check for duplicated "struct tomoyo_transition_control" entry.
+ *
+ * @a: Pointer to "struct tomoyo_acl_head".
+ * @b: Pointer to "struct tomoyo_acl_head".
+ *
+ * Returns true if @a == @b, false otherwise.
+ */
 static bool tomoyo_same_transition_control(const struct tomoyo_acl_head *a,
                                            const struct tomoyo_acl_head *b)
 {
@@ -163,30 +209,36 @@ static bool tomoyo_same_transition_control(const struct tomoyo_acl_head *a,
 }
 
 /**
- * tomoyo_update_transition_control_entry - Update "struct tomoyo_transition_control" list.
+ * tomoyo_write_transition_control - Write "struct tomoyo_transition_control" list.
  *
- * @domainname: The name of domain. Maybe NULL.
- * @program:    The name of program. Maybe NULL.
- * @type:       Type of transition.
- * @is_delete:  True if it is a delete request.
+ * @param: Pointer to "struct tomoyo_acl_param".
+ * @type:  Type of this entry.
  *
  * Returns 0 on success, negative value otherwise.
  */
-static int tomoyo_update_transition_control_entry(const char *domainname,
-                                                  const char *program,
-                                                  const u8 type,
-                                                  const bool is_delete)
+int tomoyo_write_transition_control(struct tomoyo_acl_param *param,
+                                    const u8 type)
 {
         struct tomoyo_transition_control e = { .type = type };
-        int error = is_delete ? -ENOENT : -ENOMEM;
-        if (program) {
+        int error = param->is_delete ? -ENOENT : -ENOMEM;
+        char *program = param->data;
+        char *domainname = strstr(program, " from ");
+        if (domainname) {
+                *domainname = '\0';
+                domainname += 6;
+        } else if (type == TOMOYO_TRANSITION_CONTROL_NO_KEEP ||
+                   type == TOMOYO_TRANSITION_CONTROL_KEEP) {
+                domainname = program;
+                program = NULL;
+        }
+        if (program && strcmp(program, "any")) {
                 if (!tomoyo_correct_path(program))
                         return -EINVAL;
                 e.program = tomoyo_get_name(program);
                 if (!e.program)
                         goto out;
         }
-        if (domainname) {
+        if (domainname && strcmp(domainname, "any")) {
                 if (!tomoyo_correct_domain(domainname)) {
                         if (!tomoyo_correct_path(domainname))
                                 goto out;
@@ -196,126 +248,136 @@ static int tomoyo_update_transition_control_entry(const char *domainname,
                 if (!e.domainname)
                         goto out;
         }
-        error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
-                                     &tomoyo_policy_list
-                                     [TOMOYO_ID_TRANSITION_CONTROL],
+        param->list = &param->ns->policy_list[TOMOYO_ID_TRANSITION_CONTROL];
+        error = tomoyo_update_policy(&e.head, sizeof(e), param,
                                      tomoyo_same_transition_control);
- out:
+out:
         tomoyo_put_name(e.domainname);
         tomoyo_put_name(e.program);
         return error;
 }
 
 /**
- * tomoyo_write_transition_control - Write "struct tomoyo_transition_control" list.
+ * tomoyo_scan_transition - Try to find specific domain transition type.
  *
- * @data:      String to parse.
- * @is_delete: True if it is a delete request.
- * @type:      Type of this entry.
+ * @list:       Pointer to "struct list_head".
+ * @domainname: The name of current domain.
+ * @program:    The name of requested program.
+ * @last_name:  The last component of @domainname.
+ * @type:       One of values in "enum tomoyo_transition_type".
  *
- * Returns 0 on success, negative value otherwise.
+ * Returns true if found one, false otherwise.
+ *
+ * Caller holds tomoyo_read_lock().
  */
-int tomoyo_write_transition_control(char *data, const bool is_delete,
-                                    const u8 type)
+static inline bool tomoyo_scan_transition
+(const struct list_head *list, const struct tomoyo_path_info *domainname,
+ const struct tomoyo_path_info *program, const char *last_name,
+ const enum tomoyo_transition_type type)
 {
-        char *domainname = strstr(data, " from ");
-        if (domainname) {
-                *domainname = '\0';
-                domainname += 6;
-        } else if (type == TOMOYO_TRANSITION_CONTROL_NO_KEEP ||
-                   type == TOMOYO_TRANSITION_CONTROL_KEEP) {
-                domainname = data;
-                data = NULL;
+        const struct tomoyo_transition_control *ptr;
+        list_for_each_entry_rcu(ptr, list, head.list) {
+                if (ptr->head.is_deleted || ptr->type != type)
+                        continue;
+                if (ptr->domainname) {
+                        if (!ptr->is_last_name) {
+                                if (ptr->domainname != domainname)
+                                        continue;
+                        } else {
+                                /*
+                                 * Use direct strcmp() since this is
+                                 * unlikely used.
+                                 */
+                                if (strcmp(ptr->domainname->name, last_name))
+                                        continue;
+                        }
+                }
+                if (ptr->program && tomoyo_pathcmp(ptr->program, program))
+                        continue;
+                return true;
         }
-        return tomoyo_update_transition_control_entry(domainname, data, type,
-                                                      is_delete);
+        return false;
 }
 
 /**
  * tomoyo_transition_type - Get domain transition type.
  *
- * @domainname: The name of domain.
- * @program:    The name of program.
+ * @ns:         Pointer to "struct tomoyo_policy_namespace".
+ * @domainname: The name of current domain.
+ * @program:    The name of requested program.
  *
- * Returns TOMOYO_TRANSITION_CONTROL_INITIALIZE if executing @program
- * reinitializes domain transition, TOMOYO_TRANSITION_CONTROL_KEEP if executing
- * @program suppresses domain transition, others otherwise.
+ * Returns TOMOYO_TRANSITION_CONTROL_TRANSIT if executing @program causes
+ * domain transition across namespaces, TOMOYO_TRANSITION_CONTROL_INITIALIZE if
+ * executing @program reinitializes domain transition within that namespace,
+ * TOMOYO_TRANSITION_CONTROL_KEEP if executing @program stays at @domainname ,
+ * others otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-static u8 tomoyo_transition_type(const struct tomoyo_path_info *domainname,
-                                 const struct tomoyo_path_info *program)
+static enum tomoyo_transition_type tomoyo_transition_type
+(const struct tomoyo_policy_namespace *ns,
+ const struct tomoyo_path_info *domainname,
+ const struct tomoyo_path_info *program)
 {
-        const struct tomoyo_transition_control *ptr;
         const char *last_name = tomoyo_last_word(domainname->name);
-        u8 type;
-        for (type = 0; type < TOMOYO_MAX_TRANSITION_TYPE; type++) {
- next:
-                list_for_each_entry_rcu(ptr, &tomoyo_policy_list
-                                        [TOMOYO_ID_TRANSITION_CONTROL],
-                                        head.list) {
-                        if (ptr->head.is_deleted || ptr->type != type)
-                                continue;
-                        if (ptr->domainname) {
-                                if (!ptr->is_last_name) {
-                                        if (ptr->domainname != domainname)
-                                                continue;
-                                } else {
-                                        /*
-                                         * Use direct strcmp() since this is
-                                         * unlikely used.
-                                         */
-                                        if (strcmp(ptr->domainname->name,
-                                                   last_name))
-                                                continue;
-                                }
-                        }
-                        if (ptr->program &&
-                            tomoyo_pathcmp(ptr->program, program))
-                                continue;
-                        if (type == TOMOYO_TRANSITION_CONTROL_NO_INITIALIZE) {
-                                /*
-                                 * Do not check for initialize_domain if
-                                 * no_initialize_domain matched.
-                                 */
-                                type = TOMOYO_TRANSITION_CONTROL_NO_KEEP;
-                                goto next;
-                        }
-                        goto done;
+        enum tomoyo_transition_type type = TOMOYO_TRANSITION_CONTROL_NO_RESET;
+        while (type < TOMOYO_MAX_TRANSITION_TYPE) {
+                const struct list_head * const list =
+                        &ns->policy_list[TOMOYO_ID_TRANSITION_CONTROL];
+                if (!tomoyo_scan_transition(list, domainname, program,
+                                            last_name, type)) {
+                        type++;
+                        continue;
                 }
+                if (type != TOMOYO_TRANSITION_CONTROL_NO_RESET &&
+                    type != TOMOYO_TRANSITION_CONTROL_NO_INITIALIZE)
+                        break;
+                /*
+                 * Do not check for reset_domain if no_reset_domain matched.
+                 * Do not check for initialize_domain if no_initialize_domain
+                 * matched.
+                 */
+                type++;
+                type++;
         }
- done:
         return type;
 }
 
+/**
+ * tomoyo_same_aggregator - Check for duplicated "struct tomoyo_aggregator" entry.
+ *
+ * @a: Pointer to "struct tomoyo_acl_head".
+ * @b: Pointer to "struct tomoyo_acl_head".
+ *
+ * Returns true if @a == @b, false otherwise.
+ */
 static bool tomoyo_same_aggregator(const struct tomoyo_acl_head *a,
                                    const struct tomoyo_acl_head *b)
 {
-        const struct tomoyo_aggregator *p1 = container_of(a, typeof(*p1), head);
-        const struct tomoyo_aggregator *p2 = container_of(b, typeof(*p2), head);
+        const struct tomoyo_aggregator *p1 = container_of(a, typeof(*p1),
+                                                          head);
+        const struct tomoyo_aggregator *p2 = container_of(b, typeof(*p2),
+                                                          head);
         return p1->original_name == p2->original_name &&
                 p1->aggregated_name == p2->aggregated_name;
 }
 
 /**
- * tomoyo_update_aggregator_entry - Update "struct tomoyo_aggregator" list.
+ * tomoyo_write_aggregator - Write "struct tomoyo_aggregator" list.
  *
- * @original_name:   The original program's name.
- * @aggregated_name: The program name to use.
- * @is_delete:       True if it is a delete request.
+ * @param: Pointer to "struct tomoyo_acl_param".
  *
  * Returns 0 on success, negative value otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_update_aggregator_entry(const char *original_name,
-                                          const char *aggregated_name,
-                                          const bool is_delete)
+int tomoyo_write_aggregator(struct tomoyo_acl_param *param)
 {
         struct tomoyo_aggregator e = { };
-        int error = is_delete ? -ENOENT : -ENOMEM;
-
-        if (!tomoyo_correct_path(original_name) ||
+        int error = param->is_delete ? -ENOENT : -ENOMEM;
+        const char *original_name = tomoyo_read_token(param);
+        const char *aggregated_name = tomoyo_read_token(param);
+        if (!tomoyo_correct_word(original_name) ||
             !tomoyo_correct_path(aggregated_name))
                 return -EINVAL;
         e.original_name = tomoyo_get_name(original_name);
@@ -323,83 +385,181 @@ static int tomoyo_update_aggregator_entry(const char *original_name,
         if (!e.original_name || !e.aggregated_name ||
             e.aggregated_name->is_patterned) /* No patterns allowed. */
                 goto out;
-        error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
-                                     &tomoyo_policy_list[TOMOYO_ID_AGGREGATOR],
+        param->list = &param->ns->policy_list[TOMOYO_ID_AGGREGATOR];
+        error = tomoyo_update_policy(&e.head, sizeof(e), param,
                                      tomoyo_same_aggregator);
- out:
+out:
         tomoyo_put_name(e.original_name);
         tomoyo_put_name(e.aggregated_name);
         return error;
 }
 
 /**
- * tomoyo_write_aggregator - Write "struct tomoyo_aggregator" list.
+ * tomoyo_find_namespace - Find specified namespace.
  *
- * @data:      String to parse.
- * @is_delete: True if it is a delete request.
+ * @name: Name of namespace to find.
+ * @len:  Length of @name.
  *
- * Returns 0 on success, negative value otherwise.
+ * Returns pointer to "struct tomoyo_policy_namespace" if found,
+ * NULL otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-int tomoyo_write_aggregator(char *data, const bool is_delete)
+static struct tomoyo_policy_namespace *tomoyo_find_namespace
+(const char *name, const unsigned int len)
 {
-        char *cp = strchr(data, ' ');
+        struct tomoyo_policy_namespace *ns;
+        list_for_each_entry(ns, &tomoyo_namespace_list, namespace_list) {
+                if (strncmp(name, ns->name, len) ||
+                    (name[len] && name[len] != ' '))
+                        continue;
+                return ns;
+        }
+        return NULL;
+}
 
-        if (!cp)
-                return -EINVAL;
-        *cp++ = '\0';
-        return tomoyo_update_aggregator_entry(data, cp, is_delete);
+/**
+ * tomoyo_assign_namespace - Create a new namespace.
+ *
+ * @domainname: Name of namespace to create.
+ *
+ * Returns pointer to "struct tomoyo_policy_namespace" on success,
+ * NULL otherwise.
+ *
+ * Caller holds tomoyo_read_lock().
+ */
+struct tomoyo_policy_namespace *tomoyo_assign_namespace(const char *domainname)
+{
+        struct tomoyo_policy_namespace *ptr;
+        struct tomoyo_policy_namespace *entry;
+        const char *cp = domainname;
+        unsigned int len = 0;
+        while (*cp && *cp++ != ' ')
+                len++;
+        ptr = tomoyo_find_namespace(domainname, len);
+        if (ptr)
+                return ptr;
+        if (len >= TOMOYO_EXEC_TMPSIZE - 10 || !tomoyo_domain_def(domainname))
+                return NULL;
+        entry = kzalloc(sizeof(*entry) + len + 1, GFP_NOFS);
+        if (!entry)
+                return NULL;
+        if (mutex_lock_interruptible(&tomoyo_policy_lock))
+                goto out;
+        ptr = tomoyo_find_namespace(domainname, len);
+        if (!ptr && tomoyo_memory_ok(entry)) {
+                char *name = (char *) (entry + 1);
+                ptr = entry;
+                memmove(name, domainname, len);
+                name[len] = '\0';
+                entry->name = name;
+                tomoyo_init_policy_namespace(entry);
+                entry = NULL;
+        }
+        mutex_unlock(&tomoyo_policy_lock);
+out:
+        kfree(entry);
+        return ptr;
 }
 
 /**
- * tomoyo_assign_domain - Create a domain.
+ * tomoyo_namespace_jump - Check for namespace jump.
+ *
+ * @domainname: Name of domain.
+ *
+ * Returns true if namespace differs, false otherwise.
+ */
+static bool tomoyo_namespace_jump(const char *domainname)
+{
+        const char *namespace = tomoyo_current_namespace()->name;
+        const int len = strlen(namespace);
+        return strncmp(domainname, namespace, len) ||
+                (domainname[len] && domainname[len] != ' ');
+}
+
+/**
+ * tomoyo_assign_domain - Create a domain or a namespace.
  *
  * @domainname: The name of domain.
- * @profile:    Profile number to assign if the domain was newly created.
+ * @transit:    True if transit to domain found or created.
  *
  * Returns pointer to "struct tomoyo_domain_info" on success, NULL otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
 struct tomoyo_domain_info *tomoyo_assign_domain(const char *domainname,
-                                                const u8 profile)
+                                                const bool transit)
 {
-        struct tomoyo_domain_info *entry;
-        struct tomoyo_domain_info *domain = NULL;
-        const struct tomoyo_path_info *saved_domainname;
-        bool found = false;
-
-        if (!tomoyo_correct_domain(domainname))
+        struct tomoyo_domain_info e = { };
+        struct tomoyo_domain_info *entry = tomoyo_find_domain(domainname);
+        bool created = false;
+        if (entry) {
+                if (transit) {
+                        /*
+                         * Since namespace is created at runtime, profiles may
+                         * not be created by the moment the process transits to
+                         * that domain. Do not perform domain transition if
+                         * profile for that domain is not yet created.
+                         */
+                        if (!entry->ns->profile_ptr[entry->profile])
+                                return NULL;
+                }
+                return entry;
+        }
+        /* Requested domain does not exist. */
+        /* Don't create requested domain if domainname is invalid. */
+        if (strlen(domainname) >= TOMOYO_EXEC_TMPSIZE - 10 ||
+            !tomoyo_correct_domain(domainname))
+                return NULL;
+        /*
+         * Since definition of profiles and acl_groups may differ across
+         * namespaces, do not inherit "use_profile" and "use_group" settings
+         * by automatically creating requested domain upon domain transition.
+         */
+        if (transit && tomoyo_namespace_jump(domainname))
+                return NULL;
+        e.ns = tomoyo_assign_namespace(domainname);
+        if (!e.ns)
                 return NULL;
-        saved_domainname = tomoyo_get_name(domainname);
-        if (!saved_domainname)
+        /*
+         * "use_profile" and "use_group" settings for automatically created
+         * domains are inherited from current domain. These are 0 for manually
+         * created domains.
+         */
+        if (transit) {
+                const struct tomoyo_domain_info *domain = tomoyo_domain();
+                e.profile = domain->profile;
+                e.group = domain->group;
+        }
+        e.domainname = tomoyo_get_name(domainname);
+        if (!e.domainname)
                 return NULL;
-        entry = kzalloc(sizeof(*entry), GFP_NOFS);
         if (mutex_lock_interruptible(&tomoyo_policy_lock))
                 goto out;
-        list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
-                if (domain->is_deleted ||
-                    tomoyo_pathcmp(saved_domainname, domain->domainname))
-                        continue;
-                found = true;
-                break;
-        }
-        if (!found && tomoyo_memory_ok(entry)) {
-                INIT_LIST_HEAD(&entry->acl_info_list);
-                entry->domainname = saved_domainname;
-                saved_domainname = NULL;
-                entry->profile = profile;
-                list_add_tail_rcu(&entry->list, &tomoyo_domain_list);
-                domain = entry;
-                entry = NULL;
-                found = true;
+        entry = tomoyo_find_domain(domainname);
+        if (!entry) {
+                entry = tomoyo_commit_ok(&e, sizeof(e));
+                if (entry) {
+                        INIT_LIST_HEAD(&entry->acl_info_list);
+                        list_add_tail_rcu(&entry->list, &tomoyo_domain_list);
+                        created = true;
+                }
         }
         mutex_unlock(&tomoyo_policy_lock);
- out:
-        tomoyo_put_name(saved_domainname);
-        kfree(entry);
-        return found ? domain : NULL;
+out:
+        tomoyo_put_name(e.domainname);
+        if (entry && transit) {
+                if (created) {
+                        struct tomoyo_request_info r;
+                        tomoyo_init_request_info(&r, entry,
+                                                 TOMOYO_MAC_FILE_EXECUTE);
+                        r.granted = false;
+                        tomoyo_write_log(&r, "use_profile %u\n",
+                                         entry->profile);
+                        tomoyo_write_log(&r, "use_group %u\n", entry->group);
+                }
+        }
+        return entry;
 }
 
 /**
@@ -413,22 +573,27 @@ struct tomoyo_domain_info *tomoyo_assign_domain(const char *domainname,
  */
 int tomoyo_find_next_domain(struct linux_binprm *bprm)
 {
-        struct tomoyo_request_info r;
-        char *tmp = kzalloc(TOMOYO_EXEC_TMPSIZE, GFP_NOFS);
         struct tomoyo_domain_info *old_domain = tomoyo_domain();
         struct tomoyo_domain_info *domain = NULL;
         const char *original_name = bprm->filename;
-        u8 mode;
-        bool is_enforce;
         int retval = -ENOMEM;
         bool need_kfree = false;
+        bool reject_on_transition_failure = false;
         struct tomoyo_path_info rn = { }; /* real name */
-
-        mode = tomoyo_init_request_info(&r, NULL, TOMOYO_MAC_FILE_EXECUTE);
-        is_enforce = (mode == TOMOYO_CONFIG_ENFORCING);
-        if (!tmp)
-                goto out;
-
+        struct tomoyo_execve *ee = kzalloc(sizeof(*ee), GFP_NOFS);
+        if (!ee)
+                return -ENOMEM;
+        ee->tmp = kzalloc(TOMOYO_EXEC_TMPSIZE, GFP_NOFS);
+        if (!ee->tmp) {
+                kfree(ee);
+                return -ENOMEM;
+        }
+        /* ee->dump->data is allocated by tomoyo_dump_page(). */
+        tomoyo_init_request_info(&ee->r, NULL, TOMOYO_MAC_FILE_EXECUTE);
+        ee->r.ee = ee;
+        ee->bprm = bprm;
+        ee->r.obj = &ee->obj;
+        ee->obj.path1 = bprm->file->f_path;
  retry:
         if (need_kfree) {
                 kfree(rn.name);
@@ -445,8 +610,10 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
         /* Check 'aggregator' directive. */
         {
                 struct tomoyo_aggregator *ptr;
-                list_for_each_entry_rcu(ptr, &tomoyo_policy_list
-                                        [TOMOYO_ID_AGGREGATOR], head.list) {
+                struct list_head *list =
+                        &old_domain->ns->policy_list[TOMOYO_ID_AGGREGATOR];
+                /* Check 'aggregator' directive. */
+                list_for_each_entry_rcu(ptr, list, head.list) {
                         if (ptr->head.is_deleted ||
                             !tomoyo_path_matches_pattern(&rn,
                                                          ptr->original_name))
@@ -460,7 +627,7 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
         }
 
         /* Check execute permission. */
-        retval = tomoyo_path_permission(&r, TOMOYO_TYPE_EXECUTE, &rn);
+        retval = tomoyo_path_permission(&ee->r, TOMOYO_TYPE_EXECUTE, &rn);
         if (retval == TOMOYO_RETRY_REQUEST)
                 goto retry;
         if (retval < 0)
@@ -471,20 +638,30 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
          * wildcard) rather than the pathname passed to execve()
          * (which never contains wildcard).
          */
-        if (r.param.path.matched_path) {
+        if (ee->r.param.path.matched_path) {
                 if (need_kfree)
                         kfree(rn.name);
                 need_kfree = false;
                 /* This is OK because it is read only. */
-                rn = *r.param.path.matched_path;
+                rn = *ee->r.param.path.matched_path;
         }
 
         /* Calculate domain to transit to. */
-        switch (tomoyo_transition_type(old_domain->domainname, &rn)) {
+        switch (tomoyo_transition_type(old_domain->ns, old_domain->domainname,
+                                       &rn)) {
+        case TOMOYO_TRANSITION_CONTROL_RESET:
+                /* Transit to the root of specified namespace. */
+                snprintf(ee->tmp, TOMOYO_EXEC_TMPSIZE - 1, "<%s>", rn.name);
+                /*
+                 * Make do_execve() fail if domain transition across namespaces
+                 * has failed.
+                 */
+                reject_on_transition_failure = true;
+                break;
         case TOMOYO_TRANSITION_CONTROL_INITIALIZE:
-                /* Transit to the child of tomoyo_kernel_domain domain. */
-                snprintf(tmp, TOMOYO_EXEC_TMPSIZE - 1, TOMOYO_ROOT_NAME " "
-                         "%s", rn.name);
+                /* Transit to the child of current namespace's root. */
+                snprintf(ee->tmp, TOMOYO_EXEC_TMPSIZE - 1, "%s %s",
+                         old_domain->ns->name, rn.name);
                 break;
         case TOMOYO_TRANSITION_CONTROL_KEEP:
                 /* Keep current domain. */
@@ -502,33 +679,32 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
                         domain = old_domain;
                 } else {
                         /* Normal domain transition. */
-                        snprintf(tmp, TOMOYO_EXEC_TMPSIZE - 1, "%s %s",
+                        snprintf(ee->tmp, TOMOYO_EXEC_TMPSIZE - 1, "%s %s",
                                  old_domain->domainname->name, rn.name);
                 }
                 break;
         }
-        if (domain || strlen(tmp) >= TOMOYO_EXEC_TMPSIZE - 10)
-                goto done;
-        domain = tomoyo_find_domain(tmp);
+        if (!domain)
+                domain = tomoyo_assign_domain(ee->tmp, true);
         if (domain)
-                goto done;
-        if (is_enforce) {
-                int error = tomoyo_supervisor(&r, "# wants to create domain\n"
-                                              "%s\n", tmp);
-                if (error == TOMOYO_RETRY_REQUEST)
-                        goto retry;
-                if (error < 0)
-                        goto done;
+                retval = 0;
+        else if (reject_on_transition_failure) {
+                printk(KERN_WARNING "ERROR: Domain '%s' not ready.\n",
+                       ee->tmp);
+                retval = -ENOMEM;
+        } else if (ee->r.mode == TOMOYO_CONFIG_ENFORCING)
+                retval = -ENOMEM;
+        else {
+                retval = 0;
+                if (!old_domain->flags[TOMOYO_DIF_TRANSITION_FAILED]) {
+                        old_domain->flags[TOMOYO_DIF_TRANSITION_FAILED] = true;
+                        ee->r.granted = false;
+                        tomoyo_write_log(&ee->r, "%s", tomoyo_dif
+                                         [TOMOYO_DIF_TRANSITION_FAILED]);
+                        printk(KERN_WARNING
+                               "ERROR: Domain '%s' not defined.\n", ee->tmp);
+                }
         }
-        domain = tomoyo_assign_domain(tmp, old_domain->profile);
- done:
-        if (domain)
-                goto out;
-        printk(KERN_WARNING "TOMOYO-ERROR: Domain '%s' not defined.\n", tmp);
-        if (is_enforce)
-                retval = -EPERM;
-        else
-                old_domain->transition_failed = true;
  out:
         if (!domain)
                 domain = old_domain;
@@ -537,6 +713,54 @@ int tomoyo_find_next_domain(struct linux_binprm *bprm)
         bprm->cred->security = domain;
         if (need_kfree)
                 kfree(rn.name);
-        kfree(tmp);
+        kfree(ee->tmp);
+        kfree(ee->dump.data);
+        kfree(ee);
         return retval;
 }
+
+/**
+ * tomoyo_dump_page - Dump a page to buffer.
+ *
+ * @bprm: Pointer to "struct linux_binprm".
+ * @pos:  Location to dump.
+ * @dump: Poiner to "struct tomoyo_page_dump".
+ *
+ * Returns true on success, false otherwise.
+ */
+bool tomoyo_dump_page(struct linux_binprm *bprm, unsigned long pos,
+                      struct tomoyo_page_dump *dump)
+{
+        struct page *page;
+        /* dump->data is released by tomoyo_finish_execve(). */
+        if (!dump->data) {
+                dump->data = kzalloc(PAGE_SIZE, GFP_NOFS);
+                if (!dump->data)
+                        return false;
+        }
+        /* Same with get_arg_page(bprm, pos, 0) in fs/exec.c */
+#ifdef CONFIG_MMU
+        if (get_user_pages(current, bprm->mm, pos, 1, 0, 1, &page, NULL) <= 0)
+                return false;
+#else
+        page = bprm->page[pos / PAGE_SIZE];
+#endif
+        if (page != dump->page) {
+                const unsigned int offset = pos % PAGE_SIZE;
+                /*
+                 * Maybe kmap()/kunmap() should be used here.
+                 * But remove_arg_zero() uses kmap_atomic()/kunmap_atomic().
+                 * So do I.
+                 */
+                char *kaddr = kmap_atomic(page, KM_USER0);
+                dump->page = page;
+                memcpy(dump->data + offset, kaddr + offset,
+                       PAGE_SIZE - offset);
+                kunmap_atomic(kaddr, KM_USER0);
+        }
+        /* Same with put_arg_page(page) in fs/exec.c */
+#ifdef CONFIG_MMU
+        put_page(page);
+#endif
+        return true;
+}