Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
[sfrench/cifs-2.6.git] / security / tomoyo / common.c
index b5dbdc9ff73c944b7ecd0583fa786c3d29f72726..ef43995119a453401dd768adfa5ae41a2602dd3a 100644 (file)
  *
  * Common functions for TOMOYO.
  *
- * Copyright (C) 2005-2009  NTT DATA CORPORATION
- *
- * Version: 2.2.0   2009/04/01
- *
+ * Copyright (C) 2005-2010  NTT DATA CORPORATION
  */
 
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/security.h>
-#include <linux/hardirq.h>
 #include "common.h"
 
-/* Lock for protecting policy. */
-DEFINE_MUTEX(tomoyo_policy_lock);
+static struct tomoyo_profile tomoyo_default_profile = {
+       .learning = &tomoyo_default_profile.preference,
+       .permissive = &tomoyo_default_profile.preference,
+       .enforcing = &tomoyo_default_profile.preference,
+       .preference.enforcing_verbose = true,
+       .preference.learning_max_entry = 2048,
+       .preference.learning_verbose = false,
+       .preference.permissive_verbose = true
+};
 
-/* Has loading policy done? */
-bool tomoyo_policy_loaded;
+/* Profile version. Currently only 20090903 is defined. */
+static unsigned int tomoyo_profile_version;
+
+/* Profile table. Memory is allocated as needed. */
+static struct tomoyo_profile *tomoyo_profile_ptr[TOMOYO_MAX_PROFILES];
 
 /* String table for functionality that takes 4 modes. */
-static const char *tomoyo_mode_4[4] = {
+static const char *tomoyo_mode[4] = {
        "disabled", "learning", "permissive", "enforcing"
 };
-/* String table for functionality that takes 2 modes. */
-static const char *tomoyo_mode_2[4] = {
-       "disabled", "enabled", "enabled", "enabled"
-};
 
-/*
- * tomoyo_control_array is a static data which contains
- *
- *  (1) functionality name used by /sys/kernel/security/tomoyo/profile .
- *  (2) initial values for "struct tomoyo_profile".
- *  (3) max values for "struct tomoyo_profile".
- */
-static struct {
-       const char *keyword;
-       unsigned int current_value;
-       const unsigned int max_value;
-} tomoyo_control_array[TOMOYO_MAX_CONTROL_INDEX] = {
-       [TOMOYO_MAC_FOR_FILE]     = { "MAC_FOR_FILE",        0,       3 },
-       [TOMOYO_MAX_ACCEPT_ENTRY] = { "MAX_ACCEPT_ENTRY", 2048, INT_MAX },
-       [TOMOYO_VERBOSE]          = { "TOMOYO_VERBOSE",      1,       1 },
+/* String table for /sys/kernel/security/tomoyo/profile */
+static const char *tomoyo_mac_keywords[TOMOYO_MAX_MAC_INDEX
+                                      + TOMOYO_MAX_MAC_CATEGORY_INDEX] = {
+       [TOMOYO_MAC_FILE_EXECUTE]    = "file::execute",
+       [TOMOYO_MAC_FILE_OPEN]       = "file::open",
+       [TOMOYO_MAC_FILE_CREATE]     = "file::create",
+       [TOMOYO_MAC_FILE_UNLINK]     = "file::unlink",
+       [TOMOYO_MAC_FILE_MKDIR]      = "file::mkdir",
+       [TOMOYO_MAC_FILE_RMDIR]      = "file::rmdir",
+       [TOMOYO_MAC_FILE_MKFIFO]     = "file::mkfifo",
+       [TOMOYO_MAC_FILE_MKSOCK]     = "file::mksock",
+       [TOMOYO_MAC_FILE_TRUNCATE]   = "file::truncate",
+       [TOMOYO_MAC_FILE_SYMLINK]    = "file::symlink",
+       [TOMOYO_MAC_FILE_REWRITE]    = "file::rewrite",
+       [TOMOYO_MAC_FILE_MKBLOCK]    = "file::mkblock",
+       [TOMOYO_MAC_FILE_MKCHAR]     = "file::mkchar",
+       [TOMOYO_MAC_FILE_LINK]       = "file::link",
+       [TOMOYO_MAC_FILE_RENAME]     = "file::rename",
+       [TOMOYO_MAC_FILE_CHMOD]      = "file::chmod",
+       [TOMOYO_MAC_FILE_CHOWN]      = "file::chown",
+       [TOMOYO_MAC_FILE_CHGRP]      = "file::chgrp",
+       [TOMOYO_MAC_FILE_IOCTL]      = "file::ioctl",
+       [TOMOYO_MAC_FILE_CHROOT]     = "file::chroot",
+       [TOMOYO_MAC_FILE_MOUNT]      = "file::mount",
+       [TOMOYO_MAC_FILE_UMOUNT]     = "file::umount",
+       [TOMOYO_MAC_FILE_PIVOT_ROOT] = "file::pivot_root",
+       [TOMOYO_MAX_MAC_INDEX + TOMOYO_MAC_CATEGORY_FILE] = "file",
 };
 
-/*
- * tomoyo_profile is a structure which is used for holding the mode of access
- * controls. TOMOYO has 4 modes: disabled, learning, permissive, enforcing.
- * An administrator can define up to 256 profiles.
- * The ->profile of "struct tomoyo_domain_info" is used for remembering
- * the profile's number (0 - 255) assigned to that domain.
- */
-static struct tomoyo_profile {
-       unsigned int value[TOMOYO_MAX_CONTROL_INDEX];
-       const struct tomoyo_path_info *comment;
-} *tomoyo_profile_ptr[TOMOYO_MAX_PROFILES];
-
 /* Permit policy management by non-root user? */
 static bool tomoyo_manage_by_non_root;
 
 /* Utility functions. */
 
-/* Open operation for /sys/kernel/security/tomoyo/ interface. */
-static int tomoyo_open_control(const u8 type, struct file *file);
-/* Close /sys/kernel/security/tomoyo/ interface. */
-static int tomoyo_close_control(struct file *file);
-/* Read operation for /sys/kernel/security/tomoyo/ interface. */
-static int tomoyo_read_control(struct file *file, char __user *buffer,
-                              const int buffer_len);
-/* Write operation for /sys/kernel/security/tomoyo/ interface. */
-static int tomoyo_write_control(struct file *file, const char __user *buffer,
-                               const int buffer_len);
-
-/**
- * tomoyo_parse_name_union - Parse a tomoyo_name_union.
- *
- * @filename: Name or name group.
- * @ptr:      Pointer to "struct tomoyo_name_union".
- *
- * Returns true on success, false otherwise.
- */
-bool tomoyo_parse_name_union(const char *filename,
-                            struct tomoyo_name_union *ptr)
-{
-       if (!tomoyo_is_correct_path(filename, 0, 0, 0))
-               return false;
-       if (filename[0] == '@') {
-               ptr->group = tomoyo_get_path_group(filename + 1);
-               ptr->is_group = true;
-               return ptr->group != NULL;
-       }
-       ptr->filename = tomoyo_get_name(filename);
-       ptr->is_group = false;
-       return ptr->filename != NULL;
-}
-
 /**
- * tomoyo_print_name_union - Print a tomoyo_name_union.
+ * tomoyo_yesno - Return "yes" or "no".
  *
- * @head: Pointer to "struct tomoyo_io_buffer".
- * @ptr:  Pointer to "struct tomoyo_name_union".
- *
- * Returns true on success, false otherwise.
+ * @value: Bool value.
  */
-static bool tomoyo_print_name_union(struct tomoyo_io_buffer *head,
-                                const struct tomoyo_name_union *ptr)
+static const char *tomoyo_yesno(const unsigned int value)
 {
-       int pos = head->read_avail;
-       if (pos && head->read_buf[pos - 1] == ' ')
-               head->read_avail--;
-       if (ptr->is_group)
-               return tomoyo_io_printf(head, " @%s",
-                                       ptr->group->group_name->name);
-       return tomoyo_io_printf(head, " %s", ptr->filename->name);
+       return value ? "yes" : "no";
 }
 
-/**
- * tomoyo_is_byte_range - Check whether the string isa \ooo style octal value.
- *
- * @str: Pointer to the string.
- *
- * Returns true if @str is a \ooo style octal value, false otherwise.
- *
- * TOMOYO uses \ooo style representation for 0x01 - 0x20 and 0x7F - 0xFF.
- * This function verifies that \ooo is in valid range.
- */
-static inline bool tomoyo_is_byte_range(const char *str)
+static void tomoyo_addprintf(char *buffer, int len, const char *fmt, ...)
 {
-       return *str >= '0' && *str++ <= '3' &&
-               *str >= '0' && *str++ <= '7' &&
-               *str >= '0' && *str <= '7';
-}
-
-/**
- * tomoyo_is_alphabet_char - Check whether the character is an alphabet.
- *
- * @c: The character to check.
- *
- * Returns true if @c is an alphabet character, false otherwise.
- */
-static inline bool tomoyo_is_alphabet_char(const char c)
-{
-       return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
-}
-
-/**
- * tomoyo_make_byte - Make byte value from three octal characters.
- *
- * @c1: The first character.
- * @c2: The second character.
- * @c3: The third character.
- *
- * Returns byte value.
- */
-static inline u8 tomoyo_make_byte(const u8 c1, const u8 c2, const u8 c3)
-{
-       return ((c1 - '0') << 6) + ((c2 - '0') << 3) + (c3 - '0');
+       va_list args;
+       const int pos = strlen(buffer);
+       va_start(args, fmt);
+       vsnprintf(buffer + pos, len - pos - 1, fmt, args);
+       va_end(args);
 }
 
 /**
- * tomoyo_str_starts - Check whether the given string starts with the given keyword.
- *
- * @src:  Pointer to pointer to the string.
- * @find: Pointer to the keyword.
+ * tomoyo_flush - Flush queued string to userspace's buffer.
  *
- * Returns true if @src starts with @find, false otherwise.
+ * @head:   Pointer to "struct tomoyo_io_buffer".
  *
- * The @src is updated to point the first character after the @find
- * if @src starts with @find.
+ * Returns true if all data was flushed, false otherwise.
  */
-static bool tomoyo_str_starts(char **src, const char *find)
+static bool tomoyo_flush(struct tomoyo_io_buffer *head)
 {
-       const int len = strlen(find);
-       char *tmp = *src;
-
-       if (strncmp(tmp, find, len))
-               return false;
-       tmp += len;
-       *src = tmp;
+       while (head->r.w_pos) {
+               const char *w = head->r.w[0];
+               int len = strlen(w);
+               if (len) {
+                       if (len > head->read_user_buf_avail)
+                               len = head->read_user_buf_avail;
+                       if (!len)
+                               return false;
+                       if (copy_to_user(head->read_user_buf, w, len))
+                               return false;
+                       head->read_user_buf_avail -= len;
+                       head->read_user_buf += len;
+                       w += len;
+               }
+               if (*w) {
+                       head->r.w[0] = w;
+                       return false;
+               }
+               /* Add '\0' for query. */
+               if (head->poll) {
+                       if (!head->read_user_buf_avail ||
+                           copy_to_user(head->read_user_buf, "", 1))
+                               return false;
+                       head->read_user_buf_avail--;
+                       head->read_user_buf++;
+               }
+               head->r.w_pos--;
+               for (len = 0; len < head->r.w_pos; len++)
+                       head->r.w[len] = head->r.w[len + 1];
+       }
+       head->r.avail = 0;
        return true;
 }
 
 /**
- * tomoyo_normalize_line - Format string.
- *
- * @buffer: The line to normalize.
+ * tomoyo_set_string - Queue string to "struct tomoyo_io_buffer" structure.
  *
- * Leading and trailing whitespaces are removed.
- * Multiple whitespaces are packed into single space.
+ * @head:   Pointer to "struct tomoyo_io_buffer".
+ * @string: String to print.
  *
- * Returns nothing.
+ * Note that @string has to be kept valid until @head is kfree()d.
+ * This means that char[] allocated on stack memory cannot be passed to
+ * this function. Use tomoyo_io_printf() for char[] allocated on stack memory.
  */
-static void tomoyo_normalize_line(unsigned char *buffer)
+static void tomoyo_set_string(struct tomoyo_io_buffer *head, const char *string)
 {
-       unsigned char *sp = buffer;
-       unsigned char *dp = buffer;
-       bool first = true;
-
-       while (tomoyo_is_invalid(*sp))
-               sp++;
-       while (*sp) {
-               if (!first)
-                       *dp++ = ' ';
-               first = false;
-               while (tomoyo_is_valid(*sp))
-                       *dp++ = *sp++;
-               while (tomoyo_is_invalid(*sp))
-                       sp++;
-       }
-       *dp = '\0';
+       if (head->r.w_pos < TOMOYO_MAX_IO_READ_QUEUE) {
+               head->r.w[head->r.w_pos++] = string;
+               tomoyo_flush(head);
+       } else
+               WARN_ON(1);
 }
 
 /**
- * tomoyo_tokenize - Tokenize string.
+ * tomoyo_io_printf - printf() to "struct tomoyo_io_buffer" structure.
  *
- * @buffer: The line to tokenize.
- * @w:      Pointer to "char *".
- * @size:   Sizeof @w .
- *
- * Returns true on success, false otherwise.
- */
-bool tomoyo_tokenize(char *buffer, char *w[], size_t size)
-{
-       int count = size / sizeof(char *);
-       int i;
-       for (i = 0; i < count; i++)
-               w[i] = "";
-       for (i = 0; i < count; i++) {
-               char *cp = strchr(buffer, ' ');
-               if (cp)
-                       *cp = '\0';
-               w[i] = buffer;
-               if (!cp)
-                       break;
-               buffer = cp + 1;
-       }
-       return i < count || !*buffer;
-}
-
-/**
- * tomoyo_is_correct_path - Validate a pathname.
- * @filename:     The pathname to check.
- * @start_type:   Should the pathname start with '/'?
- *                1 = must / -1 = must not / 0 = don't care
- * @pattern_type: Can the pathname contain a wildcard?
- *                1 = must / -1 = must not / 0 = don't care
- * @end_type:     Should the pathname end with '/'?
- *                1 = must / -1 = must not / 0 = don't care
- *
- * Check whether the given filename follows the naming rules.
- * Returns true if @filename follows the naming rules, false otherwise.
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ * @fmt:  The printf()'s format string, followed by parameters.
  */
-bool tomoyo_is_correct_path(const char *filename, const s8 start_type,
-                           const s8 pattern_type, const s8 end_type)
+void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...)
 {
-       const char *const start = filename;
-       bool in_repetition = false;
-       bool contains_pattern = false;
-       unsigned char c;
-       unsigned char d;
-       unsigned char e;
-
-       if (!filename)
-               goto out;
-       c = *filename;
-       if (start_type == 1) { /* Must start with '/' */
-               if (c != '/')
-                       goto out;
-       } else if (start_type == -1) { /* Must not start with '/' */
-               if (c == '/')
-                       goto out;
-       }
-       if (c)
-               c = *(filename + strlen(filename) - 1);
-       if (end_type == 1) { /* Must end with '/' */
-               if (c != '/')
-                       goto out;
-       } else if (end_type == -1) { /* Must not end with '/' */
-               if (c == '/')
-                       goto out;
-       }
-       while (1) {
-               c = *filename++;
-               if (!c)
-                       break;
-               if (c == '\\') {
-                       c = *filename++;
-                       switch (c) {
-                       case '\\':  /* "\\" */
-                               continue;
-                       case '$':   /* "\$" */
-                       case '+':   /* "\+" */
-                       case '?':   /* "\?" */
-                       case '*':   /* "\*" */
-                       case '@':   /* "\@" */
-                       case 'x':   /* "\x" */
-                       case 'X':   /* "\X" */
-                       case 'a':   /* "\a" */
-                       case 'A':   /* "\A" */
-                       case '-':   /* "\-" */
-                               if (pattern_type == -1)
-                                       break; /* Must not contain pattern */
-                               contains_pattern = true;
-                               continue;
-                       case '{':   /* "/\{" */
-                               if (filename - 3 < start ||
-                                   *(filename - 3) != '/')
-                                       break;
-                               if (pattern_type == -1)
-                                       break; /* Must not contain pattern */
-                               contains_pattern = true;
-                               in_repetition = true;
-                               continue;
-                       case '}':   /* "\}/" */
-                               if (*filename != '/')
-                                       break;
-                               if (!in_repetition)
-                                       break;
-                               in_repetition = false;
-                               continue;
-                       case '0':   /* "\ooo" */
-                       case '1':
-                       case '2':
-                       case '3':
-                               d = *filename++;
-                               if (d < '0' || d > '7')
-                                       break;
-                               e = *filename++;
-                               if (e < '0' || e > '7')
-                                       break;
-                               c = tomoyo_make_byte(c, d, e);
-                               if (tomoyo_is_invalid(c))
-                                       continue; /* pattern is not \000 */
-                       }
-                       goto out;
-               } else if (in_repetition && c == '/') {
-                       goto out;
-               } else if (tomoyo_is_invalid(c)) {
-                       goto out;
-               }
-       }
-       if (pattern_type == 1) { /* Must contain pattern */
-               if (!contains_pattern)
-                       goto out;
+       va_list args;
+       int len;
+       int pos = head->r.avail;
+       int size = head->readbuf_size - pos;
+       if (size <= 0)
+               return;
+       va_start(args, fmt);
+       len = vsnprintf(head->read_buf + pos, size, fmt, args) + 1;
+       va_end(args);
+       if (pos + len >= head->readbuf_size) {
+               WARN_ON(1);
+               return;
        }
-       if (in_repetition)
-               goto out;
-       return true;
- out:
-       return false;
+       head->r.avail += len;
+       tomoyo_set_string(head, head->read_buf + pos);
 }
 
-/**
- * tomoyo_is_correct_domain - Check whether the given domainname follows the naming rules.
- * @domainname:   The domainname to check.
- *
- * Returns true if @domainname follows the naming rules, false otherwise.
- */
-bool tomoyo_is_correct_domain(const unsigned char *domainname)
+static void tomoyo_set_space(struct tomoyo_io_buffer *head)
 {
-       unsigned char c;
-       unsigned char d;
-       unsigned char e;
-
-       if (!domainname || strncmp(domainname, TOMOYO_ROOT_NAME,
-                                  TOMOYO_ROOT_NAME_LEN))
-               goto out;
-       domainname += TOMOYO_ROOT_NAME_LEN;
-       if (!*domainname)
-               return true;
-       do {
-               if (*domainname++ != ' ')
-                       goto out;
-               if (*domainname++ != '/')
-                       goto out;
-               while ((c = *domainname) != '\0' && c != ' ') {
-                       domainname++;
-                       if (c == '\\') {
-                               c = *domainname++;
-                               switch ((c)) {
-                               case '\\':  /* "\\" */
-                                       continue;
-                               case '0':   /* "\ooo" */
-                               case '1':
-                               case '2':
-                               case '3':
-                                       d = *domainname++;
-                                       if (d < '0' || d > '7')
-                                               break;
-                                       e = *domainname++;
-                                       if (e < '0' || e > '7')
-                                               break;
-                                       c = tomoyo_make_byte(c, d, e);
-                                       if (tomoyo_is_invalid(c))
-                                               /* pattern is not \000 */
-                                               continue;
-                               }
-                               goto out;
-                       } else if (tomoyo_is_invalid(c)) {
-                               goto out;
-                       }
-               }
-       } while (*domainname);
-       return true;
- out:
-       return false;
+       tomoyo_set_string(head, " ");
 }
 
-/**
- * tomoyo_is_domain_def - Check whether the given token can be a domainname.
- *
- * @buffer: The token to check.
- *
- * Returns true if @buffer possibly be a domainname, false otherwise.
- */
-bool tomoyo_is_domain_def(const unsigned char *buffer)
+static bool tomoyo_set_lf(struct tomoyo_io_buffer *head)
 {
-       return !strncmp(buffer, TOMOYO_ROOT_NAME, TOMOYO_ROOT_NAME_LEN);
+       tomoyo_set_string(head, "\n");
+       return !head->r.w_pos;
 }
 
 /**
- * tomoyo_find_domain - Find a domain by the given name.
- *
- * @domainname: The domainname to find.
- *
- * Returns pointer to "struct tomoyo_domain_info" if found, NULL otherwise.
+ * tomoyo_print_name_union - Print a tomoyo_name_union.
  *
- * Caller holds tomoyo_read_lock().
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ * @ptr:  Pointer to "struct tomoyo_name_union".
  */
-struct tomoyo_domain_info *tomoyo_find_domain(const char *domainname)
+static void tomoyo_print_name_union(struct tomoyo_io_buffer *head,
+                                   const struct tomoyo_name_union *ptr)
 {
-       struct tomoyo_domain_info *domain;
-       struct tomoyo_path_info name;
-
-       name.name = domainname;
-       tomoyo_fill_path_info(&name);
-       list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
-               if (!domain->is_deleted &&
-                   !tomoyo_pathcmp(&name, domain->domainname))
-                       return domain;
+       tomoyo_set_space(head);
+       if (ptr->is_group) {
+               tomoyo_set_string(head, "@");
+               tomoyo_set_string(head, ptr->group->group_name->name);
+       } else {
+               tomoyo_set_string(head, ptr->filename->name);
        }
-       return NULL;
 }
 
 /**
- * tomoyo_const_part_length - Evaluate the initial length without a pattern in a token.
+ * tomoyo_print_number_union - Print a tomoyo_number_union.
  *
- * @filename: The string to evaluate.
- *
- * Returns the initial length without a pattern in @filename.
+ * @head:       Pointer to "struct tomoyo_io_buffer".
+ * @ptr:        Pointer to "struct tomoyo_number_union".
  */
-static int tomoyo_const_part_length(const char *filename)
+static void tomoyo_print_number_union(struct tomoyo_io_buffer *head,
+                                     const struct tomoyo_number_union *ptr)
 {
-       char c;
-       int len = 0;
-
-       if (!filename)
-               return 0;
-       while ((c = *filename++) != '\0') {
-               if (c != '\\') {
-                       len++;
-                       continue;
-               }
-               c = *filename++;
-               switch (c) {
-               case '\\':  /* "\\" */
-                       len += 2;
-                       continue;
-               case '0':   /* "\ooo" */
-               case '1':
-               case '2':
-               case '3':
-                       c = *filename++;
-                       if (c < '0' || c > '7')
+       tomoyo_set_space(head);
+       if (ptr->is_group) {
+               tomoyo_set_string(head, "@");
+               tomoyo_set_string(head, ptr->group->group_name->name);
+       } else {
+               int i;
+               unsigned long min = ptr->values[0];
+               const unsigned long max = ptr->values[1];
+               u8 min_type = ptr->min_type;
+               const u8 max_type = ptr->max_type;
+               char buffer[128];
+               buffer[0] = '\0';
+               for (i = 0; i < 2; i++) {
+                       switch (min_type) {
+                       case TOMOYO_VALUE_TYPE_HEXADECIMAL:
+                               tomoyo_addprintf(buffer, sizeof(buffer),
+                                                "0x%lX", min);
                                break;
-                       c = *filename++;
-                       if (c < '0' || c > '7')
+                       case TOMOYO_VALUE_TYPE_OCTAL:
+                               tomoyo_addprintf(buffer, sizeof(buffer),
+                                                "0%lo", min);
                                break;
-                       len += 4;
-                       continue;
-               }
-               break;
-       }
-       return len;
-}
-
-/**
- * tomoyo_fill_path_info - Fill in "struct tomoyo_path_info" members.
- *
- * @ptr: Pointer to "struct tomoyo_path_info" to fill in.
- *
- * The caller sets "struct tomoyo_path_info"->name.
- */
-void tomoyo_fill_path_info(struct tomoyo_path_info *ptr)
-{
-       const char *name = ptr->name;
-       const int len = strlen(name);
-
-       ptr->const_len = tomoyo_const_part_length(name);
-       ptr->is_dir = len && (name[len - 1] == '/');
-       ptr->is_patterned = (ptr->const_len < len);
-       ptr->hash = full_name_hash(name, len);
-}
-
-/**
- * tomoyo_file_matches_pattern2 - Pattern matching without '/' character
- * and "\-" pattern.
- *
- * @filename:     The start of string to check.
- * @filename_end: The end of string to check.
- * @pattern:      The start of pattern to compare.
- * @pattern_end:  The end of pattern to compare.
- *
- * Returns true if @filename matches @pattern, false otherwise.
- */
-static bool tomoyo_file_matches_pattern2(const char *filename,
-                                        const char *filename_end,
-                                        const char *pattern,
-                                        const char *pattern_end)
-{
-       while (filename < filename_end && pattern < pattern_end) {
-               char c;
-               if (*pattern != '\\') {
-                       if (*filename++ != *pattern++)
-                               return false;
-                       continue;
-               }
-               c = *filename;
-               pattern++;
-               switch (*pattern) {
-                       int i;
-                       int j;
-               case '?':
-                       if (c == '/') {
-                               return false;
-                       } else if (c == '\\') {
-                               if (filename[1] == '\\')
-                                       filename++;
-                               else if (tomoyo_is_byte_range(filename + 1))
-                                       filename += 3;
-                               else
-                                       return false;
-                       }
-                       break;
-               case '\\':
-                       if (c != '\\')
-                               return false;
-                       if (*++filename != '\\')
-                               return false;
-                       break;
-               case '+':
-                       if (!isdigit(c))
-                               return false;
-                       break;
-               case 'x':
-                       if (!isxdigit(c))
-                               return false;
-                       break;
-               case 'a':
-                       if (!tomoyo_is_alphabet_char(c))
-                               return false;
-                       break;
-               case '0':
-               case '1':
-               case '2':
-               case '3':
-                       if (c == '\\' && tomoyo_is_byte_range(filename + 1)
-                           && strncmp(filename + 1, pattern, 3) == 0) {
-                               filename += 3;
-                               pattern += 2;
+                       default:
+                               tomoyo_addprintf(buffer, sizeof(buffer),
+                                                "%lu", min);
                                break;
                        }
-                       return false; /* Not matched. */
-               case '*':
-               case '@':
-                       for (i = 0; i <= filename_end - filename; i++) {
-                               if (tomoyo_file_matches_pattern2(
-                                                   filename + i, filename_end,
-                                                   pattern + 1, pattern_end))
-                                       return true;
-                               c = filename[i];
-                               if (c == '.' && *pattern == '@')
-                                       break;
-                               if (c != '\\')
-                                       continue;
-                               if (filename[i + 1] == '\\')
-                                       i++;
-                               else if (tomoyo_is_byte_range(filename + i + 1))
-                                       i += 3;
-                               else
-                                       break; /* Bad pattern. */
-                       }
-                       return false; /* Not matched. */
-               default:
-                       j = 0;
-                       c = *pattern;
-                       if (c == '$') {
-                               while (isdigit(filename[j]))
-                                       j++;
-                       } else if (c == 'X') {
-                               while (isxdigit(filename[j]))
-                                       j++;
-                       } else if (c == 'A') {
-                               while (tomoyo_is_alphabet_char(filename[j]))
-                                       j++;
-                       }
-                       for (i = 1; i <= j; i++) {
-                               if (tomoyo_file_matches_pattern2(
-                                                   filename + i, filename_end,
-                                                   pattern + 1, pattern_end))
-                                       return true;
-                       }
-                       return false; /* Not matched or bad pattern. */
+                       if (min == max && min_type == max_type)
+                               break;
+                       tomoyo_addprintf(buffer, sizeof(buffer), "-");
+                       min_type = max_type;
+                       min = max;
                }
-               filename++;
-               pattern++;
+               tomoyo_io_printf(head, "%s", buffer);
        }
-       while (*pattern == '\\' &&
-              (*(pattern + 1) == '*' || *(pattern + 1) == '@'))
-               pattern += 2;
-       return filename == filename_end && pattern == pattern_end;
 }
 
 /**
- * tomoyo_file_matches_pattern - Pattern matching without without '/' character.
- *
- * @filename:     The start of string to check.
- * @filename_end: The end of string to check.
- * @pattern:      The start of pattern to compare.
- * @pattern_end:  The end of pattern to compare.
+ * tomoyo_assign_profile - Create a new profile.
  *
- * Returns true if @filename matches @pattern, false otherwise.
- */
-static bool tomoyo_file_matches_pattern(const char *filename,
-                                          const char *filename_end,
-                                          const char *pattern,
-                                          const char *pattern_end)
-{
-       const char *pattern_start = pattern;
-       bool first = true;
-       bool result;
-
-       while (pattern < pattern_end - 1) {
-               /* Split at "\-" pattern. */
-               if (*pattern++ != '\\' || *pattern++ != '-')
-                       continue;
-               result = tomoyo_file_matches_pattern2(filename,
-                                                     filename_end,
-                                                     pattern_start,
-                                                     pattern - 2);
-               if (first)
-                       result = !result;
-               if (result)
-                       return false;
-               first = false;
-               pattern_start = pattern;
-       }
-       result = tomoyo_file_matches_pattern2(filename, filename_end,
-                                             pattern_start, pattern_end);
-       return first ? result : !result;
-}
-
-/**
- * tomoyo_path_matches_pattern2 - Do pathname pattern matching.
- *
- * @f: The start of string to check.
- * @p: The start of pattern to compare.
+ * @profile: Profile number to create.
  *
- * Returns true if @f matches @p, false otherwise.
+ * Returns pointer to "struct tomoyo_profile" on success, NULL otherwise.
  */
-static bool tomoyo_path_matches_pattern2(const char *f, const char *p)
+static struct tomoyo_profile *tomoyo_assign_profile(const unsigned int profile)
 {
-       const char *f_delimiter;
-       const char *p_delimiter;
-
-       while (*f && *p) {
-               f_delimiter = strchr(f, '/');
-               if (!f_delimiter)
-                       f_delimiter = f + strlen(f);
-               p_delimiter = strchr(p, '/');
-               if (!p_delimiter)
-                       p_delimiter = p + strlen(p);
-               if (*p == '\\' && *(p + 1) == '{')
-                       goto recursive;
-               if (!tomoyo_file_matches_pattern(f, f_delimiter, p,
-                                                p_delimiter))
-                       return false;
-               f = f_delimiter;
-               if (*f)
-                       f++;
-               p = p_delimiter;
-               if (*p)
-                       p++;
+       struct tomoyo_profile *ptr;
+       struct tomoyo_profile *entry;
+       if (profile >= TOMOYO_MAX_PROFILES)
+               return NULL;
+       ptr = tomoyo_profile_ptr[profile];
+       if (ptr)
+               return ptr;
+       entry = kzalloc(sizeof(*entry), GFP_NOFS);
+       if (mutex_lock_interruptible(&tomoyo_policy_lock))
+               goto out;
+       ptr = tomoyo_profile_ptr[profile];
+       if (!ptr && tomoyo_memory_ok(entry)) {
+               ptr = entry;
+               ptr->learning = &tomoyo_default_profile.preference;
+               ptr->permissive = &tomoyo_default_profile.preference;
+               ptr->enforcing = &tomoyo_default_profile.preference;
+               ptr->default_config = TOMOYO_CONFIG_DISABLED;
+               memset(ptr->config, TOMOYO_CONFIG_USE_DEFAULT,
+                      sizeof(ptr->config));
+               mb(); /* Avoid out-of-order execution. */
+               tomoyo_profile_ptr[profile] = ptr;
+               entry = NULL;
        }
-       /* Ignore trailing "\*" and "\@" in @pattern. */
-       while (*p == '\\' &&
-              (*(p + 1) == '*' || *(p + 1) == '@'))
-               p += 2;
-       return !*f && !*p;
- recursive:
-       /*
-        * The "\{" pattern is permitted only after '/' character.
-        * This guarantees that below "*(p - 1)" is safe.
-        * Also, the "\}" pattern is permitted only before '/' character
-        * so that "\{" + "\}" pair will not break the "\-" operator.
-        */
-       if (*(p - 1) != '/' || p_delimiter <= p + 3 || *p_delimiter != '/' ||
-           *(p_delimiter - 1) != '}' || *(p_delimiter - 2) != '\\')
-               return false; /* Bad pattern. */
-       do {
-               /* Compare current component with pattern. */
-               if (!tomoyo_file_matches_pattern(f, f_delimiter, p + 2,
-                                                p_delimiter - 2))
-                       break;
-               /* Proceed to next component. */
-               f = f_delimiter;
-               if (!*f)
-                       break;
-               f++;
-               /* Continue comparison. */
-               if (tomoyo_path_matches_pattern2(f, p_delimiter + 1))
-                       return true;
-               f_delimiter = strchr(f, '/');
-       } while (f_delimiter);
-       return false; /* Not matched. */
-}
-
-/**
- * tomoyo_path_matches_pattern - Check whether the given filename matches the given pattern.
- *
- * @filename: The filename to check.
- * @pattern:  The pattern to compare.
- *
- * Returns true if matches, false otherwise.
- *
- * The following patterns are available.
- *   \\     \ itself.
- *   \ooo   Octal representation of a byte.
- *   \*     Zero or more repetitions of characters other than '/'.
- *   \@     Zero or more repetitions of characters other than '/' or '.'.
- *   \?     1 byte character other than '/'.
- *   \$     One or more repetitions of decimal digits.
- *   \+     1 decimal digit.
- *   \X     One or more repetitions of hexadecimal digits.
- *   \x     1 hexadecimal digit.
- *   \A     One or more repetitions of alphabet characters.
- *   \a     1 alphabet character.
- *
- *   \-     Subtraction operator.
- *
- *   /\{dir\}/   '/' + 'One or more repetitions of dir/' (e.g. /dir/ /dir/dir/
- *               /dir/dir/dir/ ).
- */
-bool tomoyo_path_matches_pattern(const struct tomoyo_path_info *filename,
-                                const struct tomoyo_path_info *pattern)
-{
-       const char *f = filename->name;
-       const char *p = pattern->name;
-       const int len = pattern->const_len;
-
-       /* If @pattern doesn't contain pattern, I can use strcmp(). */
-       if (!pattern->is_patterned)
-               return !tomoyo_pathcmp(filename, pattern);
-       /* Don't compare directory and non-directory. */
-       if (filename->is_dir != pattern->is_dir)
-               return false;
-       /* Compare the initial length without patterns. */
-       if (strncmp(f, p, len))
-               return false;
-       f += len;
-       p += len;
-       return tomoyo_path_matches_pattern2(f, p);
+       mutex_unlock(&tomoyo_policy_lock);
+ out:
+       kfree(entry);
+       return ptr;
 }
 
 /**
- * tomoyo_io_printf - Transactional printf() to "struct tomoyo_io_buffer" structure.
- *
- * @head: Pointer to "struct tomoyo_io_buffer".
- * @fmt:  The printf()'s format string, followed by parameters.
+ * tomoyo_profile - Find a profile.
  *
- * Returns true if output was written, false otherwise.
+ * @profile: Profile number to find.
  *
- * The snprintf() will truncate, but tomoyo_io_printf() won't.
+ * Returns pointer to "struct tomoyo_profile".
  */
-bool tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...)
+struct tomoyo_profile *tomoyo_profile(const u8 profile)
 {
-       va_list args;
-       int len;
-       int pos = head->read_avail;
-       int size = head->readbuf_size - pos;
-
-       if (size <= 0)
-               return false;
-       va_start(args, fmt);
-       len = vsnprintf(head->read_buf + pos, size, fmt, args);
-       va_end(args);
-       if (pos + len >= head->readbuf_size)
-               return false;
-       head->read_avail += len;
-       return true;
+       struct tomoyo_profile *ptr = tomoyo_profile_ptr[profile];
+       if (!tomoyo_policy_loaded)
+               return &tomoyo_default_profile;
+       BUG_ON(!ptr);
+       return ptr;
 }
 
-/**
- * tomoyo_get_exe - Get tomoyo_realpath() of current process.
- *
- * Returns the tomoyo_realpath() of current process on success, NULL otherwise.
- *
- * This function uses kzalloc(), so the caller must call kfree()
- * if this function didn't return NULL.
- */
-static const char *tomoyo_get_exe(void)
+static s8 tomoyo_find_yesno(const char *string, const char *find)
 {
-       struct mm_struct *mm = current->mm;
-       struct vm_area_struct *vma;
-       const char *cp = NULL;
-
-       if (!mm)
-               return NULL;
-       down_read(&mm->mmap_sem);
-       for (vma = mm->mmap; vma; vma = vma->vm_next) {
-               if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file) {
-                       cp = tomoyo_realpath_from_path(&vma->vm_file->f_path);
-                       break;
-               }
+       const char *cp = strstr(string, find);
+       if (cp) {
+               cp += strlen(find);
+               if (!strncmp(cp, "=yes", 4))
+                       return 1;
+               else if (!strncmp(cp, "=no", 3))
+                       return 0;
        }
-       up_read(&mm->mmap_sem);
-       return cp;
+       return -1;
 }
 
-/**
- * tomoyo_get_msg - Get warning message.
- *
- * @is_enforce: Is it enforcing mode?
- *
- * Returns "ERROR" or "WARNING".
- */
-const char *tomoyo_get_msg(const bool is_enforce)
+static void tomoyo_set_bool(bool *b, const char *string, const char *find)
 {
-       if (is_enforce)
-               return "ERROR";
-       else
-               return "WARNING";
+       switch (tomoyo_find_yesno(string, find)) {
+       case 1:
+               *b = true;
+               break;
+       case 0:
+               *b = false;
+               break;
+       }
 }
 
-/**
- * tomoyo_check_flags - Check mode for specified functionality.
- *
- * @domain: Pointer to "struct tomoyo_domain_info".
- * @index:  The functionality to check mode.
- *
- * TOMOYO checks only process context.
- * This code disables TOMOYO's enforcement in case the function is called from
- * interrupt context.
- */
-unsigned int tomoyo_check_flags(const struct tomoyo_domain_info *domain,
-                               const u8 index)
+static void tomoyo_set_uint(unsigned int *i, const char *string,
+                           const char *find)
 {
-       const u8 profile = domain->profile;
-
-       if (WARN_ON(in_interrupt()))
-               return 0;
-       return tomoyo_policy_loaded && index < TOMOYO_MAX_CONTROL_INDEX
-#if TOMOYO_MAX_PROFILES != 256
-               && profile < TOMOYO_MAX_PROFILES
-#endif
-               && tomoyo_profile_ptr[profile] ?
-               tomoyo_profile_ptr[profile]->value[index] : 0;
-}
-
-/**
- * tomoyo_verbose_mode - Check whether TOMOYO is verbose mode.
- *
- * @domain: Pointer to "struct tomoyo_domain_info".
- *
- * Returns true if domain policy violation warning should be printed to
- * console.
- */
-bool tomoyo_verbose_mode(const struct tomoyo_domain_info *domain)
-{
-       return tomoyo_check_flags(domain, TOMOYO_VERBOSE) != 0;
+       const char *cp = strstr(string, find);
+       if (cp)
+               sscanf(cp + strlen(find), "=%u", i);
 }
 
-/**
- * tomoyo_domain_quota_is_ok - Check for domain's quota.
- *
- * @domain: Pointer to "struct tomoyo_domain_info".
- *
- * Returns true if the domain is not exceeded quota, false otherwise.
- *
- * Caller holds tomoyo_read_lock().
- */
-bool tomoyo_domain_quota_is_ok(struct tomoyo_domain_info * const domain)
+static void tomoyo_set_pref(const char *name, const char *value,
+                           const bool use_default,
+                           struct tomoyo_profile *profile)
 {
-       unsigned int count = 0;
-       struct tomoyo_acl_info *ptr;
-
-       if (!domain)
-               return true;
-       list_for_each_entry_rcu(ptr, &domain->acl_info_list, list) {
-               switch (ptr->type) {
-                       struct tomoyo_path_acl *acl;
-                       u32 perm;
-                       u8 i;
-               case TOMOYO_TYPE_PATH_ACL:
-                       acl = container_of(ptr, struct tomoyo_path_acl, head);
-                       perm = acl->perm | (((u32) acl->perm_high) << 16);
-                       for (i = 0; i < TOMOYO_MAX_PATH_OPERATION; i++)
-                               if (perm & (1 << i))
-                                       count++;
-                       if (perm & (1 << TOMOYO_TYPE_READ_WRITE))
-                               count -= 2;
-                       break;
-               case TOMOYO_TYPE_PATH2_ACL:
-                       perm = container_of(ptr, struct tomoyo_path2_acl, head)
-                               ->perm;
-                       for (i = 0; i < TOMOYO_MAX_PATH2_OPERATION; i++)
-                               if (perm & (1 << i))
-                                       count++;
-                       break;
+       struct tomoyo_preference **pref;
+       bool *verbose;
+       if (!strcmp(name, "enforcing")) {
+               if (use_default) {
+                       pref = &profile->enforcing;
+                       goto set_default;
                }
+               profile->enforcing = &profile->preference;
+               verbose = &profile->preference.enforcing_verbose;
+               goto set_verbose;
        }
-       if (count < tomoyo_check_flags(domain, TOMOYO_MAX_ACCEPT_ENTRY))
-               return true;
-       if (!domain->quota_warned) {
-               domain->quota_warned = true;
-               printk(KERN_WARNING "TOMOYO-WARNING: "
-                      "Domain '%s' has so many ACLs to hold. "
-                      "Stopped learning mode.\n", domain->domainname->name);
+       if (!strcmp(name, "permissive")) {
+               if (use_default) {
+                       pref = &profile->permissive;
+                       goto set_default;
+               }
+               profile->permissive = &profile->preference;
+               verbose = &profile->preference.permissive_verbose;
+               goto set_verbose;
        }
-       return false;
+       if (!strcmp(name, "learning")) {
+               if (use_default) {
+                       pref = &profile->learning;
+                       goto set_default;
+               }
+               profile->learning = &profile->preference;
+               tomoyo_set_uint(&profile->preference.learning_max_entry, value,
+                            "max_entry");
+               verbose = &profile->preference.learning_verbose;
+               goto set_verbose;
+       }
+       return;
+ set_default:
+       *pref = &tomoyo_default_profile.preference;
+       return;
+ set_verbose:
+       tomoyo_set_bool(verbose, value, "verbose");
 }
 
-/**
- * tomoyo_find_or_assign_new_profile - Create a new profile.
- *
- * @profile: Profile number to create.
- *
- * Returns pointer to "struct tomoyo_profile" on success, NULL otherwise.
- */
-static struct tomoyo_profile *tomoyo_find_or_assign_new_profile(const unsigned
-                                                               int profile)
+static int tomoyo_set_mode(char *name, const char *value,
+                          const bool use_default,
+                          struct tomoyo_profile *profile)
 {
-       struct tomoyo_profile *ptr = NULL;
-       int i;
-
-       if (profile >= TOMOYO_MAX_PROFILES)
-               return NULL;
-       if (mutex_lock_interruptible(&tomoyo_policy_lock))
-               return NULL;
-       ptr = tomoyo_profile_ptr[profile];
-       if (ptr)
-               goto ok;
-       ptr = kmalloc(sizeof(*ptr), GFP_NOFS);
-       if (!tomoyo_memory_ok(ptr)) {
-               kfree(ptr);
-               ptr = NULL;
-               goto ok;
+       u8 i;
+       u8 config;
+       if (!strcmp(name, "CONFIG")) {
+               i = TOMOYO_MAX_MAC_INDEX + TOMOYO_MAX_MAC_CATEGORY_INDEX;
+               config = profile->default_config;
+       } else if (tomoyo_str_starts(&name, "CONFIG::")) {
+               config = 0;
+               for (i = 0; i < TOMOYO_MAX_MAC_INDEX
+                            + TOMOYO_MAX_MAC_CATEGORY_INDEX; i++) {
+                       if (strcmp(name, tomoyo_mac_keywords[i]))
+                               continue;
+                       config = profile->config[i];
+                       break;
+               }
+               if (i == TOMOYO_MAX_MAC_INDEX + TOMOYO_MAX_MAC_CATEGORY_INDEX)
+                       return -EINVAL;
+       } else {
+               return -EINVAL;
        }
-       for (i = 0; i < TOMOYO_MAX_CONTROL_INDEX; i++)
-               ptr->value[i] = tomoyo_control_array[i].current_value;
-       mb(); /* Avoid out-of-order execution. */
-       tomoyo_profile_ptr[profile] = ptr;
- ok:
-       mutex_unlock(&tomoyo_policy_lock);
-       return ptr;
+       if (use_default) {
+               config = TOMOYO_CONFIG_USE_DEFAULT;
+       } else {
+               u8 mode;
+               for (mode = 0; mode < 4; mode++)
+                       if (strstr(value, tomoyo_mode[mode]))
+                               /*
+                                * Update lower 3 bits in order to distinguish
+                                * 'config' from 'TOMOYO_CONFIG_USE_DEAFULT'.
+                                */
+                               config = (config & ~7) | mode;
+       }
+       if (i < TOMOYO_MAX_MAC_INDEX + TOMOYO_MAX_MAC_CATEGORY_INDEX)
+               profile->config[i] = config;
+       else if (config != TOMOYO_CONFIG_USE_DEFAULT)
+               profile->default_config = config;
+       return 0;
 }
 
 /**
- * tomoyo_write_profile - Write to profile table.
+ * tomoyo_write_profile - Write profile table.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  *
@@ -980,153 +430,165 @@ static int tomoyo_write_profile(struct tomoyo_io_buffer *head)
 {
        char *data = head->write_buf;
        unsigned int i;
-       unsigned int value;
+       bool use_default = false;
        char *cp;
        struct tomoyo_profile *profile;
-       unsigned long num;
-
-       cp = strchr(data, '-');
-       if (cp)
-               *cp = '\0';
-       if (strict_strtoul(data, 10, &num))
-               return -EINVAL;
-       if (cp)
+       if (sscanf(data, "PROFILE_VERSION=%u", &tomoyo_profile_version) == 1)
+               return 0;
+       i = simple_strtoul(data, &cp, 10);
+       if (data == cp) {
+               profile = &tomoyo_default_profile;
+       } else {
+               if (*cp != '-')
+                       return -EINVAL;
                data = cp + 1;
-       profile = tomoyo_find_or_assign_new_profile(num);
-       if (!profile)
-               return -EINVAL;
+               profile = tomoyo_assign_profile(i);
+               if (!profile)
+                       return -EINVAL;
+       }
        cp = strchr(data, '=');
        if (!cp)
                return -EINVAL;
-       *cp = '\0';
+       *cp++ = '\0';
+       if (profile != &tomoyo_default_profile)
+               use_default = strstr(cp, "use_default") != NULL;
+       if (tomoyo_str_starts(&data, "PREFERENCE::")) {
+               tomoyo_set_pref(data, cp, use_default, profile);
+               return 0;
+       }
+       if (profile == &tomoyo_default_profile)
+               return -EINVAL;
        if (!strcmp(data, "COMMENT")) {
                const struct tomoyo_path_info *old_comment = profile->comment;
-               profile->comment = tomoyo_get_name(cp + 1);
+               profile->comment = tomoyo_get_name(cp);
                tomoyo_put_name(old_comment);
                return 0;
        }
-       for (i = 0; i < TOMOYO_MAX_CONTROL_INDEX; i++) {
-               if (strcmp(data, tomoyo_control_array[i].keyword))
-                       continue;
-               if (sscanf(cp + 1, "%u", &value) != 1) {
-                       int j;
-                       const char **modes;
-                       switch (i) {
-                       case TOMOYO_VERBOSE:
-                               modes = tomoyo_mode_2;
-                               break;
-                       default:
-                               modes = tomoyo_mode_4;
-                               break;
-                       }
-                       for (j = 0; j < 4; j++) {
-                               if (strcmp(cp + 1, modes[j]))
-                                       continue;
-                               value = j;
-                               break;
-                       }
-                       if (j == 4)
-                               return -EINVAL;
-               } else if (value > tomoyo_control_array[i].max_value) {
-                       value = tomoyo_control_array[i].max_value;
-               }
-               profile->value[i] = value;
-               return 0;
+       return tomoyo_set_mode(data, cp, use_default, profile);
+}
+
+static void tomoyo_print_preference(struct tomoyo_io_buffer *head,
+                                   const int idx)
+{
+       struct tomoyo_preference *pref = &tomoyo_default_profile.preference;
+       const struct tomoyo_profile *profile = idx >= 0 ?
+               tomoyo_profile_ptr[idx] : NULL;
+       char buffer[16] = "";
+       if (profile) {
+               buffer[sizeof(buffer) - 1] = '\0';
+               snprintf(buffer, sizeof(buffer) - 1, "%u-", idx);
        }
-       return -EINVAL;
+       if (profile) {
+               pref = profile->learning;
+               if (pref == &tomoyo_default_profile.preference)
+                       goto skip1;
+       }
+       tomoyo_io_printf(head, "%sPREFERENCE::%s={ "
+                        "verbose=%s max_entry=%u }\n",
+                        buffer, "learning",
+                        tomoyo_yesno(pref->learning_verbose),
+                        pref->learning_max_entry);
+ skip1:
+       if (profile) {
+               pref = profile->permissive;
+               if (pref == &tomoyo_default_profile.preference)
+                       goto skip2;
+       }
+       tomoyo_io_printf(head, "%sPREFERENCE::%s={ verbose=%s }\n",
+                        buffer, "permissive",
+                        tomoyo_yesno(pref->permissive_verbose));
+ skip2:
+       if (profile) {
+               pref = profile->enforcing;
+               if (pref == &tomoyo_default_profile.preference)
+                       return;
+       }
+       tomoyo_io_printf(head, "%sPREFERENCE::%s={ verbose=%s }\n",
+                        buffer, "enforcing",
+                        tomoyo_yesno(pref->enforcing_verbose));
+}
+
+static void tomoyo_print_config(struct tomoyo_io_buffer *head, const u8 config)
+{
+       tomoyo_io_printf(head, "={ mode=%s }\n", tomoyo_mode[config & 3]);
 }
 
 /**
- * tomoyo_read_profile - Read from profile table.
+ * tomoyo_read_profile - Read profile table.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
- *
- * Returns 0.
  */
-static int tomoyo_read_profile(struct tomoyo_io_buffer *head)
+static void tomoyo_read_profile(struct tomoyo_io_buffer *head)
 {
-       static const int total = TOMOYO_MAX_CONTROL_INDEX + 1;
-       int step;
-
-       if (head->read_eof)
-               return 0;
-       for (step = head->read_step; step < TOMOYO_MAX_PROFILES * total;
-            step++) {
-               const u8 index = step / total;
-               u8 type = step % total;
-               const struct tomoyo_profile *profile
-                       = tomoyo_profile_ptr[index];
-               head->read_step = step;
-               if (!profile)
-                       continue;
-               if (!type) { /* Print profile' comment tag. */
-                       if (!tomoyo_io_printf(head, "%u-COMMENT=%s\n",
-                                             index, profile->comment ?
-                                             profile->comment->name : ""))
+       u8 index;
+       const struct tomoyo_profile *profile;
+ next:
+       index = head->r.index;
+       profile = tomoyo_profile_ptr[index];
+       switch (head->r.step) {
+       case 0:
+               tomoyo_io_printf(head, "PROFILE_VERSION=%s\n", "20090903");
+               tomoyo_print_preference(head, -1);
+               head->r.step++;
+               break;
+       case 1:
+               for ( ; head->r.index < TOMOYO_MAX_PROFILES;
+                     head->r.index++)
+                       if (tomoyo_profile_ptr[head->r.index])
                                break;
-                       continue;
+               if (head->r.index == TOMOYO_MAX_PROFILES)
+                       return;
+               head->r.step++;
+               break;
+       case 2:
+               {
+                       const struct tomoyo_path_info *comment =
+                               profile->comment;
+                       tomoyo_io_printf(head, "%u-COMMENT=", index);
+                       tomoyo_set_string(head, comment ? comment->name : "");
+                       tomoyo_set_lf(head);
+                       head->r.step++;
                }
-               type--;
-               if (type < TOMOYO_MAX_CONTROL_INDEX) {
-                       const unsigned int value = profile->value[type];
-                       const char **modes = NULL;
-                       const char *keyword
-                               = tomoyo_control_array[type].keyword;
-                       switch (tomoyo_control_array[type].max_value) {
-                       case 3:
-                               modes = tomoyo_mode_4;
-                               break;
-                       case 1:
-                               modes = tomoyo_mode_2;
-                               break;
-                       }
-                       if (modes) {
-                               if (!tomoyo_io_printf(head, "%u-%s=%s\n", index,
-                                                     keyword, modes[value]))
-                                       break;
-                       } else {
-                               if (!tomoyo_io_printf(head, "%u-%s=%u\n", index,
-                                                     keyword, value))
-                                       break;
-                       }
+               break;
+       case 3:
+               {
+                       tomoyo_io_printf(head, "%u-%s", index, "CONFIG");
+                       tomoyo_print_config(head, profile->default_config);
+                       head->r.bit = 0;
+                       head->r.step++;
+               }
+               break;
+       case 4:
+               for ( ; head->r.bit < TOMOYO_MAX_MAC_INDEX
+                             + TOMOYO_MAX_MAC_CATEGORY_INDEX; head->r.bit++) {
+                       const u8 i = head->r.bit;
+                       const u8 config = profile->config[i];
+                       if (config == TOMOYO_CONFIG_USE_DEFAULT)
+                               continue;
+                       tomoyo_io_printf(head, "%u-%s%s", index, "CONFIG::",
+                                        tomoyo_mac_keywords[i]);
+                       tomoyo_print_config(head, config);
+                       head->r.bit++;
+                       break;
+               }
+               if (head->r.bit == TOMOYO_MAX_MAC_INDEX
+                   + TOMOYO_MAX_MAC_CATEGORY_INDEX) {
+                       tomoyo_print_preference(head, index);
+                       head->r.index++;
+                       head->r.step = 1;
                }
+               break;
        }
-       if (step == TOMOYO_MAX_PROFILES * total)
-               head->read_eof = true;
-       return 0;
+       if (tomoyo_flush(head))
+               goto next;
 }
 
-/*
- * tomoyo_policy_manager_list is used for holding list of domainnames or
- * programs which are permitted to modify configuration via
- * /sys/kernel/security/tomoyo/ interface.
- *
- * An entry is added by
- *
- * # echo '<kernel> /sbin/mingetty /bin/login /bin/bash' > \
- *                                        /sys/kernel/security/tomoyo/manager
- *  (if you want to specify by a domainname)
- *
- *  or
- *
- * # echo '/usr/lib/ccs/editpolicy' > /sys/kernel/security/tomoyo/manager
- *  (if you want to specify by a program's location)
- *
- * and is deleted by
- *
- * # echo 'delete <kernel> /sbin/mingetty /bin/login /bin/bash' > \
- *                                        /sys/kernel/security/tomoyo/manager
- *
- *  or
- *
- * # echo 'delete /usr/lib/ccs/editpolicy' > \
- *                                        /sys/kernel/security/tomoyo/manager
- *
- * and all entries are retrieved by
- *
- * # cat /sys/kernel/security/tomoyo/manager
- */
-LIST_HEAD(tomoyo_policy_manager_list);
+static bool tomoyo_same_manager(const struct tomoyo_acl_head *a,
+                               const struct tomoyo_acl_head *b)
+{
+       return container_of(a, struct tomoyo_manager, head)->manager ==
+               container_of(b, struct tomoyo_manager, head)->manager;
+}
 
 /**
  * tomoyo_update_manager_entry - Add a manager entry.
@@ -1141,47 +603,29 @@ LIST_HEAD(tomoyo_policy_manager_list);
 static int tomoyo_update_manager_entry(const char *manager,
                                       const bool is_delete)
 {
-       struct tomoyo_policy_manager_entry *ptr;
-       struct tomoyo_policy_manager_entry e = { };
-       int error = is_delete ? -ENOENT : -ENOMEM;
+       struct tomoyo_manager e = { };
+       int error;
 
-       if (tomoyo_is_domain_def(manager)) {
-               if (!tomoyo_is_correct_domain(manager))
+       if (tomoyo_domain_def(manager)) {
+               if (!tomoyo_correct_domain(manager))
                        return -EINVAL;
                e.is_domain = true;
        } else {
-               if (!tomoyo_is_correct_path(manager, 1, -1, -1))
+               if (!tomoyo_correct_path(manager))
                        return -EINVAL;
        }
        e.manager = tomoyo_get_name(manager);
        if (!e.manager)
                return -ENOMEM;
-       if (mutex_lock_interruptible(&tomoyo_policy_lock))
-               goto out;
-       list_for_each_entry_rcu(ptr, &tomoyo_policy_manager_list, list) {
-               if (ptr->manager != e.manager)
-                       continue;
-               ptr->is_deleted = is_delete;
-               error = 0;
-               break;
-       }
-       if (!is_delete && error) {
-               struct tomoyo_policy_manager_entry *entry =
-                       tomoyo_commit_ok(&e, sizeof(e));
-               if (entry) {
-                       list_add_tail_rcu(&entry->list,
-                                         &tomoyo_policy_manager_list);
-                       error = 0;
-               }
-       }
-       mutex_unlock(&tomoyo_policy_lock);
- out:
+       error = tomoyo_update_policy(&e.head, sizeof(e), is_delete,
+                                    &tomoyo_policy_list[TOMOYO_ID_MANAGER],
+                                    tomoyo_same_manager);
        tomoyo_put_name(e.manager);
        return error;
 }
 
 /**
- * tomoyo_write_manager_policy - Write manager policy.
+ * tomoyo_write_manager - Write manager policy.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  *
@@ -1189,7 +633,7 @@ static int tomoyo_update_manager_entry(const char *manager,
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_write_manager_policy(struct tomoyo_io_buffer *head)
+static int tomoyo_write_manager(struct tomoyo_io_buffer *head)
 {
        char *data = head->write_buf;
        bool is_delete = tomoyo_str_starts(&data, TOMOYO_KEYWORD_DELETE);
@@ -1202,47 +646,41 @@ static int tomoyo_write_manager_policy(struct tomoyo_io_buffer *head)
 }
 
 /**
- * tomoyo_read_manager_policy - Read manager policy.
+ * tomoyo_read_manager - Read manager policy.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  *
- * Returns 0.
- *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_read_manager_policy(struct tomoyo_io_buffer *head)
+static void tomoyo_read_manager(struct tomoyo_io_buffer *head)
 {
-       struct list_head *pos;
-       bool done = true;
-
-       if (head->read_eof)
-               return 0;
-       list_for_each_cookie(pos, head->read_var2,
-                            &tomoyo_policy_manager_list) {
-               struct tomoyo_policy_manager_entry *ptr;
-               ptr = list_entry(pos, struct tomoyo_policy_manager_entry,
-                                list);
-               if (ptr->is_deleted)
+       if (head->r.eof)
+               return;
+       list_for_each_cookie(head->r.acl,
+                            &tomoyo_policy_list[TOMOYO_ID_MANAGER]) {
+               struct tomoyo_manager *ptr =
+                       list_entry(head->r.acl, typeof(*ptr), head.list);
+               if (ptr->head.is_deleted)
                        continue;
-               done = tomoyo_io_printf(head, "%s\n", ptr->manager->name);
-               if (!done)
-                       break;
+               if (!tomoyo_flush(head))
+                       return;
+               tomoyo_set_string(head, ptr->manager->name);
+               tomoyo_set_lf(head);
        }
-       head->read_eof = done;
-       return 0;
+       head->r.eof = true;
 }
 
 /**
- * tomoyo_is_policy_manager - Check whether the current process is a policy manager.
+ * tomoyo_manager - Check whether the current process is a policy manager.
  *
  * Returns true if the current process is permitted to modify policy
  * via /sys/kernel/security/tomoyo/ interface.
  *
  * Caller holds tomoyo_read_lock().
  */
-static bool tomoyo_is_policy_manager(void)
+static bool tomoyo_manager(void)
 {
-       struct tomoyo_policy_manager_entry *ptr;
+       struct tomoyo_manager *ptr;
        const char *exe;
        const struct task_struct *task = current;
        const struct tomoyo_path_info *domainname = tomoyo_domain()->domainname;
@@ -1252,8 +690,9 @@ static bool tomoyo_is_policy_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_policy_manager_list, list) {
-               if (!ptr->is_deleted && ptr->is_domain
+       list_for_each_entry_rcu(ptr, &tomoyo_policy_list[TOMOYO_ID_MANAGER],
+                               head.list) {
+               if (!ptr->head.is_deleted && ptr->is_domain
                    && !tomoyo_pathcmp(domainname, ptr->manager)) {
                        found = true;
                        break;
@@ -1264,8 +703,9 @@ static bool tomoyo_is_policy_manager(void)
        exe = tomoyo_get_exe();
        if (!exe)
                return false;
-       list_for_each_entry_rcu(ptr, &tomoyo_policy_manager_list, list) {
-               if (!ptr->is_deleted && !ptr->is_domain
+       list_for_each_entry_rcu(ptr, &tomoyo_policy_list[TOMOYO_ID_MANAGER],
+                               head.list) {
+               if (!ptr->head.is_deleted && !ptr->is_domain
                    && !strcmp(exe, ptr->manager->name)) {
                        found = true;
                        break;
@@ -1285,7 +725,7 @@ static bool tomoyo_is_policy_manager(void)
 }
 
 /**
- * tomoyo_is_select_one - Parse select command.
+ * tomoyo_select_one - Parse select command.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  * @data: String to parse.
@@ -1294,23 +734,31 @@ static bool tomoyo_is_policy_manager(void)
  *
  * Caller holds tomoyo_read_lock().
  */
-static bool tomoyo_is_select_one(struct tomoyo_io_buffer *head,
-                                const char *data)
+static bool tomoyo_select_one(struct tomoyo_io_buffer *head, const char *data)
 {
        unsigned int pid;
        struct tomoyo_domain_info *domain = NULL;
+       bool global_pid = false;
 
-       if (sscanf(data, "pid=%u", &pid) == 1) {
+       if (!strcmp(data, "allow_execute")) {
+               head->r.print_execute_only = true;
+               return true;
+       }
+       if (sscanf(data, "pid=%u", &pid) == 1 ||
+           (global_pid = true, sscanf(data, "global-pid=%u", &pid) == 1)) {
                struct task_struct *p;
                rcu_read_lock();
                read_lock(&tasklist_lock);
-               p = find_task_by_vpid(pid);
+               if (global_pid)
+                       p = find_task_by_pid_ns(pid, &init_pid_ns);
+               else
+                       p = find_task_by_vpid(pid);
                if (p)
                        domain = tomoyo_real_domain(p);
                read_unlock(&tasklist_lock);
                rcu_read_unlock();
        } else if (!strncmp(data, "domain=", 7)) {
-               if (tomoyo_is_domain_def(data + 7))
+               if (tomoyo_domain_def(data + 7))
                        domain = tomoyo_find_domain(data + 7);
        } else
                return false;
@@ -1318,24 +766,13 @@ static bool tomoyo_is_select_one(struct tomoyo_io_buffer *head,
        /* Accessing read_buf is safe because head->io_sem is held. */
        if (!head->read_buf)
                return true; /* Do nothing if open(O_WRONLY). */
-       head->read_avail = 0;
+       memset(&head->r, 0, sizeof(head->r));
+       head->r.print_this_domain_only = true;
+       head->r.eof = !domain;
+       head->r.domain = &domain->list;
        tomoyo_io_printf(head, "# select %s\n", data);
-       head->read_single_domain = true;
-       head->read_eof = !domain;
-       if (domain) {
-               struct tomoyo_domain_info *d;
-               head->read_var1 = NULL;
-               list_for_each_entry_rcu(d, &tomoyo_domain_list, list) {
-                       if (d == domain)
-                               break;
-                       head->read_var1 = &d->list;
-               }
-               head->read_var2 = NULL;
-               head->read_bit = 0;
-               head->read_step = 0;
-               if (domain->is_deleted)
-                       tomoyo_io_printf(head, "# This is a deleted domain.\n");
-       }
+       if (domain && domain->is_deleted)
+               tomoyo_io_printf(head, "# This is a deleted domain.\n");
        return true;
 }
 
@@ -1373,7 +810,24 @@ static int tomoyo_delete_domain(char *domainname)
 }
 
 /**
- * tomoyo_write_domain_policy - Write domain policy.
+ * tomoyo_write_domain2 - Write domain policy.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ *
+ * Returns 0 on success, negative value otherwise.
+ *
+ * Caller holds tomoyo_read_lock().
+ */
+static int tomoyo_write_domain2(char *data, struct tomoyo_domain_info *domain,
+                               const bool is_delete)
+{
+       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_ALLOW_MOUNT))
+               return tomoyo_write_mount(data, domain, is_delete);
+       return tomoyo_write_file(data, domain, is_delete);
+}
+
+/**
+ * tomoyo_write_domain - Write domain policy.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  *
@@ -1381,7 +835,7 @@ static int tomoyo_delete_domain(char *domainname)
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_write_domain_policy(struct tomoyo_io_buffer *head)
+static int tomoyo_write_domain(struct tomoyo_io_buffer *head)
 {
        char *data = head->write_buf;
        struct tomoyo_domain_info *domain = head->write_var1;
@@ -1393,19 +847,19 @@ static int tomoyo_write_domain_policy(struct tomoyo_io_buffer *head)
                is_delete = true;
        else if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_SELECT))
                is_select = true;
-       if (is_select && tomoyo_is_select_one(head, data))
+       if (is_select && tomoyo_select_one(head, data))
                return 0;
        /* Don't allow updating policies by non manager programs. */
-       if (!tomoyo_is_policy_manager())
+       if (!tomoyo_manager())
                return -EPERM;
-       if (tomoyo_is_domain_def(data)) {
+       if (tomoyo_domain_def(data)) {
                domain = NULL;
                if (is_delete)
                        tomoyo_delete_domain(data);
                else if (is_select)
                        domain = tomoyo_find_domain(data);
                else
-                       domain = tomoyo_find_or_assign_new_domain(data, 0);
+                       domain = tomoyo_assign_domain(data, 0);
                head->write_var1 = domain;
                return 0;
        }
@@ -1422,179 +876,198 @@ static int tomoyo_write_domain_policy(struct tomoyo_io_buffer *head)
                domain->ignore_global_allow_read = !is_delete;
                return 0;
        }
-       return tomoyo_write_file_policy(data, domain, is_delete);
+       if (!strcmp(data, TOMOYO_KEYWORD_QUOTA_EXCEEDED)) {
+               domain->quota_warned = !is_delete;
+               return 0;
+       }
+       if (!strcmp(data, TOMOYO_KEYWORD_TRANSITION_FAILED)) {
+               domain->transition_failed = !is_delete;
+               return 0;
+       }
+       return tomoyo_write_domain2(data, domain, is_delete);
 }
 
 /**
- * tomoyo_print_path_acl - Print a single path ACL entry.
+ * tomoyo_fns - Find next set bit.
  *
- * @head: Pointer to "struct tomoyo_io_buffer".
- * @ptr:  Pointer to "struct tomoyo_path_acl".
+ * @perm: 8 bits value.
+ * @bit:  First bit to find.
  *
- * Returns true on success, false otherwise.
+ * Returns next on-bit on success, 8 otherwise.
  */
-static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
-                                 struct tomoyo_path_acl *ptr)
+static u8 tomoyo_fns(const u8 perm, u8 bit)
 {
-       int pos;
-       u8 bit;
-       const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
-
-       for (bit = head->read_bit; bit < TOMOYO_MAX_PATH_OPERATION; bit++) {
-               if (!(perm & (1 << bit)))
-                       continue;
-               /* Print "read/write" instead of "read" and "write". */
-               if ((bit == TOMOYO_TYPE_READ || bit == TOMOYO_TYPE_WRITE)
-                   && (perm & (1 << TOMOYO_TYPE_READ_WRITE)))
-                       continue;
-               pos = head->read_avail;
-               if (!tomoyo_io_printf(head, "allow_%s ",
-                                     tomoyo_path2keyword(bit)) ||
-                   !tomoyo_print_name_union(head, &ptr->name) ||
-                   !tomoyo_io_printf(head, "\n"))
-                       goto out;
-       }
-       head->read_bit = 0;
-       return true;
- out:
-       head->read_bit = bit;
-       head->read_avail = pos;
-       return false;
+       for ( ; bit < 8; bit++)
+               if (perm & (1 << bit))
+                       break;
+       return bit;
 }
 
 /**
- * tomoyo_print_path2_acl - Print a double path ACL entry.
+ * tomoyo_print_entry - Print an ACL entry.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
- * @ptr:  Pointer to "struct tomoyo_path2_acl".
+ * @acl:  Pointer to an ACL entry.
  *
  * Returns true on success, false otherwise.
  */
-static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
-                                  struct tomoyo_path2_acl *ptr)
+static bool tomoyo_print_entry(struct tomoyo_io_buffer *head,
+                              struct tomoyo_acl_info *acl)
 {
-       int pos;
-       const u8 perm = ptr->perm;
+       const u8 acl_type = acl->type;
        u8 bit;
 
-       for (bit = head->read_bit; bit < TOMOYO_MAX_PATH2_OPERATION; bit++) {
-               if (!(perm & (1 << bit)))
-                       continue;
-               pos = head->read_avail;
-               if (!tomoyo_io_printf(head, "allow_%s ",
-                                     tomoyo_path22keyword(bit)) ||
-                   !tomoyo_print_name_union(head, &ptr->name1) ||
-                   !tomoyo_print_name_union(head, &ptr->name2) ||
-                   !tomoyo_io_printf(head, "\n"))
-                       goto out;
+       if (acl->is_deleted)
+               return true;
+ next:
+       bit = head->r.bit;
+       if (!tomoyo_flush(head))
+               return false;
+       else if (acl_type == TOMOYO_TYPE_PATH_ACL) {
+               struct tomoyo_path_acl *ptr =
+                       container_of(acl, typeof(*ptr), head);
+               const u16 perm = ptr->perm;
+               for ( ; bit < TOMOYO_MAX_PATH_OPERATION; bit++) {
+                       if (!(perm & (1 << bit)))
+                               continue;
+                       if (head->r.print_execute_only &&
+                           bit != TOMOYO_TYPE_EXECUTE)
+                               continue;
+                       /* Print "read/write" instead of "read" and "write". */
+                       if ((bit == TOMOYO_TYPE_READ ||
+                            bit == TOMOYO_TYPE_WRITE)
+                           && (perm & (1 << TOMOYO_TYPE_READ_WRITE)))
+                               continue;
+                       break;
+               }
+               if (bit >= TOMOYO_MAX_PATH_OPERATION)
+                       goto done;
+               tomoyo_io_printf(head, "allow_%s", tomoyo_path_keyword[bit]);
+               tomoyo_print_name_union(head, &ptr->name);
+       } else if (head->r.print_execute_only) {
+               return true;
+       } else if (acl_type == TOMOYO_TYPE_PATH2_ACL) {
+               struct tomoyo_path2_acl *ptr =
+                       container_of(acl, typeof(*ptr), head);
+               bit = tomoyo_fns(ptr->perm, bit);
+               if (bit >= TOMOYO_MAX_PATH2_OPERATION)
+                       goto done;
+               tomoyo_io_printf(head, "allow_%s", tomoyo_path2_keyword[bit]);
+               tomoyo_print_name_union(head, &ptr->name1);
+               tomoyo_print_name_union(head, &ptr->name2);
+       } else if (acl_type == TOMOYO_TYPE_PATH_NUMBER_ACL) {
+               struct tomoyo_path_number_acl *ptr =
+                       container_of(acl, typeof(*ptr), head);
+               bit = tomoyo_fns(ptr->perm, bit);
+               if (bit >= TOMOYO_MAX_PATH_NUMBER_OPERATION)
+                       goto done;
+               tomoyo_io_printf(head, "allow_%s",
+                                tomoyo_path_number_keyword[bit]);
+               tomoyo_print_name_union(head, &ptr->name);
+               tomoyo_print_number_union(head, &ptr->number);
+       } else if (acl_type == TOMOYO_TYPE_MKDEV_ACL) {
+               struct tomoyo_mkdev_acl *ptr =
+                       container_of(acl, typeof(*ptr), head);
+               bit = tomoyo_fns(ptr->perm, bit);
+               if (bit >= TOMOYO_MAX_MKDEV_OPERATION)
+                       goto done;
+               tomoyo_io_printf(head, "allow_%s", tomoyo_mkdev_keyword[bit]);
+               tomoyo_print_name_union(head, &ptr->name);
+               tomoyo_print_number_union(head, &ptr->mode);
+               tomoyo_print_number_union(head, &ptr->major);
+               tomoyo_print_number_union(head, &ptr->minor);
+       } else if (acl_type == TOMOYO_TYPE_MOUNT_ACL) {
+               struct tomoyo_mount_acl *ptr =
+                       container_of(acl, typeof(*ptr), head);
+               tomoyo_io_printf(head, "allow_mount");
+               tomoyo_print_name_union(head, &ptr->dev_name);
+               tomoyo_print_name_union(head, &ptr->dir_name);
+               tomoyo_print_name_union(head, &ptr->fs_type);
+               tomoyo_print_number_union(head, &ptr->flags);
        }
-       head->read_bit = 0;
+       head->r.bit = bit + 1;
+       tomoyo_io_printf(head, "\n");
+       if (acl_type != TOMOYO_TYPE_MOUNT_ACL)
+               goto next;
+ done:
+       head->r.bit = 0;
        return true;
- out:
-       head->read_bit = bit;
-       head->read_avail = pos;
-       return false;
 }
 
 /**
- * tomoyo_print_entry - Print an ACL entry.
+ * tomoyo_read_domain2 - Read domain policy.
  *
- * @head: Pointer to "struct tomoyo_io_buffer".
- * @ptr:  Pointer to an ACL entry.
+ * @head:   Pointer to "struct tomoyo_io_buffer".
+ * @domain: Pointer to "struct tomoyo_domain_info".
+ *
+ * Caller holds tomoyo_read_lock().
  *
  * Returns true on success, false otherwise.
  */
-static bool tomoyo_print_entry(struct tomoyo_io_buffer *head,
-                              struct tomoyo_acl_info *ptr)
+static bool tomoyo_read_domain2(struct tomoyo_io_buffer *head,
+                               struct tomoyo_domain_info *domain)
 {
-       const u8 acl_type = ptr->type;
-
-       if (acl_type == TOMOYO_TYPE_PATH_ACL) {
-               struct tomoyo_path_acl *acl
-                       = container_of(ptr, struct tomoyo_path_acl, head);
-               return tomoyo_print_path_acl(head, acl);
-       }
-       if (acl_type == TOMOYO_TYPE_PATH2_ACL) {
-               struct tomoyo_path2_acl *acl
-                       = container_of(ptr, struct tomoyo_path2_acl, head);
-               return tomoyo_print_path2_acl(head, acl);
+       list_for_each_cookie(head->r.acl, &domain->acl_info_list) {
+               struct tomoyo_acl_info *ptr =
+                       list_entry(head->r.acl, typeof(*ptr), list);
+               if (!tomoyo_print_entry(head, ptr))
+                       return false;
        }
-       BUG(); /* This must not happen. */
-       return false;
+       head->r.acl = NULL;
+       return true;
 }
 
 /**
- * tomoyo_read_domain_policy - Read domain policy.
+ * tomoyo_read_domain - Read domain policy.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  *
- * Returns 0.
- *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_read_domain_policy(struct tomoyo_io_buffer *head)
+static void tomoyo_read_domain(struct tomoyo_io_buffer *head)
 {
-       struct list_head *dpos;
-       struct list_head *apos;
-       bool done = true;
-
-       if (head->read_eof)
-               return 0;
-       if (head->read_step == 0)
-               head->read_step = 1;
-       list_for_each_cookie(dpos, head->read_var1, &tomoyo_domain_list) {
-               struct tomoyo_domain_info *domain;
-               const char *quota_exceeded = "";
-               const char *transition_failed = "";
-               const char *ignore_global_allow_read = "";
-               domain = list_entry(dpos, struct tomoyo_domain_info, list);
-               if (head->read_step != 1)
-                       goto acl_loop;
-               if (domain->is_deleted && !head->read_single_domain)
-                       continue;
-               /* Print domainname and flags. */
-               if (domain->quota_warned)
-                       quota_exceeded = "quota_exceeded\n";
-               if (domain->transition_failed)
-                       transition_failed = "transition_failed\n";
-               if (domain->ignore_global_allow_read)
-                       ignore_global_allow_read
-                               = TOMOYO_KEYWORD_IGNORE_GLOBAL_ALLOW_READ "\n";
-               done = tomoyo_io_printf(head, "%s\n" TOMOYO_KEYWORD_USE_PROFILE
-                                       "%u\n%s%s%s\n",
-                                       domain->domainname->name,
-                                       domain->profile, quota_exceeded,
-                                       transition_failed,
-                                       ignore_global_allow_read);
-               if (!done)
-                       break;
-               head->read_step = 2;
-acl_loop:
-               if (head->read_step == 3)
-                       goto tail_mark;
-               /* Print ACL entries in the domain. */
-               list_for_each_cookie(apos, head->read_var2,
-                                    &domain->acl_info_list) {
-                       struct tomoyo_acl_info *ptr
-                               = list_entry(apos, struct tomoyo_acl_info,
-                                            list);
-                       done = tomoyo_print_entry(head, ptr);
-                       if (!done)
-                               break;
+       if (head->r.eof)
+               return;
+       list_for_each_cookie(head->r.domain, &tomoyo_domain_list) {
+               struct tomoyo_domain_info *domain =
+                       list_entry(head->r.domain, typeof(*domain), list);
+               switch (head->r.step) {
+               case 0:
+                       if (domain->is_deleted &&
+                           !head->r.print_this_domain_only)
+                               continue;
+                       /* Print domainname and flags. */
+                       tomoyo_set_string(head, domain->domainname->name);
+                       tomoyo_set_lf(head);
+                       tomoyo_io_printf(head,
+                                        TOMOYO_KEYWORD_USE_PROFILE "%u\n",
+                                        domain->profile);
+                       if (domain->quota_warned)
+                               tomoyo_set_string(head, "quota_exceeded\n");
+                       if (domain->transition_failed)
+                               tomoyo_set_string(head, "transition_failed\n");
+                       if (domain->ignore_global_allow_read)
+                               tomoyo_set_string(head,
+                                      TOMOYO_KEYWORD_IGNORE_GLOBAL_ALLOW_READ
+                                                 "\n");
+                       head->r.step++;
+                       tomoyo_set_lf(head);
+                       /* fall through */
+               case 1:
+                       if (!tomoyo_read_domain2(head, domain))
+                               return;
+                       head->r.step++;
+                       if (!tomoyo_set_lf(head))
+                               return;
+                       /* fall through */
+               case 2:
+                       head->r.step = 0;
+                       if (head->r.print_this_domain_only)
+                               goto done;
                }
-               if (!done)
-                       break;
-               head->read_step = 3;
-tail_mark:
-               done = tomoyo_io_printf(head, "\n");
-               if (!done)
-                       break;
-               head->read_step = 1;
-               if (head->read_single_domain)
-                       break;
        }
-       head->read_eof = done;
-       return 0;
+ done:
+       head->r.eof = true;
 }
 
 /**
@@ -1607,7 +1080,7 @@ tail_mark:
  * This is equivalent to doing
  *
  *     ( echo "select " $domainname; echo "use_profile " $profile ) |
- *     /usr/lib/ccs/loadpolicy -d
+ *     /usr/sbin/tomoyo-loadpolicy -d
  *
  * Caller holds tomoyo_read_lock().
  */
@@ -1631,279 +1104,637 @@ static int tomoyo_write_domain_profile(struct tomoyo_io_buffer *head)
 }
 
 /**
- * tomoyo_read_domain_profile - Read only domainname and profile.
+ * tomoyo_read_domain_profile - Read only domainname and profile.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ *
+ * Returns list of profile number and domainname pairs.
+ *
+ * This is equivalent to doing
+ *
+ *     grep -A 1 '^<kernel>' /sys/kernel/security/tomoyo/domain_policy |
+ *     awk ' { if ( domainname == "" ) { if ( $1 == "<kernel>" )
+ *     domainname = $0; } else if ( $1 == "use_profile" ) {
+ *     print $2 " " domainname; domainname = ""; } } ; '
+ *
+ * Caller holds tomoyo_read_lock().
+ */
+static void tomoyo_read_domain_profile(struct tomoyo_io_buffer *head)
+{
+       if (head->r.eof)
+               return;
+       list_for_each_cookie(head->r.domain, &tomoyo_domain_list) {
+               struct tomoyo_domain_info *domain =
+                       list_entry(head->r.domain, typeof(*domain), list);
+               if (domain->is_deleted)
+                       continue;
+               if (!tomoyo_flush(head))
+                       return;
+               tomoyo_io_printf(head, "%u ", domain->profile);
+               tomoyo_set_string(head, domain->domainname->name);
+               tomoyo_set_lf(head);
+       }
+       head->r.eof = true;
+}
+
+/**
+ * tomoyo_write_pid: Specify PID to obtain domainname.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ *
+ * Returns 0.
+ */
+static int tomoyo_write_pid(struct tomoyo_io_buffer *head)
+{
+       head->r.eof = false;
+       return 0;
+}
+
+/**
+ * tomoyo_read_pid - Get domainname of the specified PID.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ *
+ * Returns the domainname which the specified PID is in on success,
+ * empty string otherwise.
+ * The PID is specified by tomoyo_write_pid() so that the user can obtain
+ * using read()/write() interface rather than sysctl() interface.
+ */
+static void tomoyo_read_pid(struct tomoyo_io_buffer *head)
+{
+       char *buf = head->write_buf;
+       bool global_pid = false;
+       unsigned int pid;
+       struct task_struct *p;
+       struct tomoyo_domain_info *domain = NULL;
+
+       /* Accessing write_buf is safe because head->io_sem is held. */
+       if (!buf) {
+               head->r.eof = true;
+               return; /* Do nothing if open(O_RDONLY). */
+       }
+       if (head->r.w_pos || head->r.eof)
+               return;
+       head->r.eof = true;
+       if (tomoyo_str_starts(&buf, "global-pid "))
+               global_pid = true;
+       pid = (unsigned int) simple_strtoul(buf, NULL, 10);
+       rcu_read_lock();
+       read_lock(&tasklist_lock);
+       if (global_pid)
+               p = find_task_by_pid_ns(pid, &init_pid_ns);
+       else
+               p = find_task_by_vpid(pid);
+       if (p)
+               domain = tomoyo_real_domain(p);
+       read_unlock(&tasklist_lock);
+       rcu_read_unlock();
+       if (!domain)
+               return;
+       tomoyo_io_printf(head, "%u %u ", pid, domain->profile);
+       tomoyo_set_string(head, domain->domainname->name);
+}
+
+static const char *tomoyo_transition_type[TOMOYO_MAX_TRANSITION_TYPE] = {
+       [TOMOYO_TRANSITION_CONTROL_NO_INITIALIZE]
+       = TOMOYO_KEYWORD_NO_INITIALIZE_DOMAIN,
+       [TOMOYO_TRANSITION_CONTROL_INITIALIZE]
+       = TOMOYO_KEYWORD_INITIALIZE_DOMAIN,
+       [TOMOYO_TRANSITION_CONTROL_NO_KEEP] = TOMOYO_KEYWORD_NO_KEEP_DOMAIN,
+       [TOMOYO_TRANSITION_CONTROL_KEEP] = TOMOYO_KEYWORD_KEEP_DOMAIN
+};
+
+static const char *tomoyo_group_name[TOMOYO_MAX_GROUP] = {
+       [TOMOYO_PATH_GROUP] = TOMOYO_KEYWORD_PATH_GROUP,
+       [TOMOYO_NUMBER_GROUP] = TOMOYO_KEYWORD_NUMBER_GROUP
+};
+
+/**
+ * tomoyo_write_exception - Write exception policy.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ *
+ * Returns 0 on success, negative value otherwise.
+ *
+ * Caller holds tomoyo_read_lock().
+ */
+static int tomoyo_write_exception(struct tomoyo_io_buffer *head)
+{
+       char *data = head->write_buf;
+       bool is_delete = tomoyo_str_starts(&data, TOMOYO_KEYWORD_DELETE);
+       u8 i;
+       static const struct {
+               const char *keyword;
+               int (*write) (char *, const bool);
+       } tomoyo_callback[4] = {
+               { TOMOYO_KEYWORD_AGGREGATOR, tomoyo_write_aggregator },
+               { TOMOYO_KEYWORD_FILE_PATTERN, tomoyo_write_pattern },
+               { TOMOYO_KEYWORD_DENY_REWRITE, tomoyo_write_no_rewrite },
+               { TOMOYO_KEYWORD_ALLOW_READ, tomoyo_write_globally_readable },
+       };
+
+       for (i = 0; i < TOMOYO_MAX_TRANSITION_TYPE; i++)
+               if (tomoyo_str_starts(&data, tomoyo_transition_type[i]))
+                       return tomoyo_write_transition_control(data, is_delete,
+                                                              i);
+       for (i = 0; i < 4; i++)
+               if (tomoyo_str_starts(&data, tomoyo_callback[i].keyword))
+                       return tomoyo_callback[i].write(data, is_delete);
+       for (i = 0; i < TOMOYO_MAX_GROUP; i++)
+               if (tomoyo_str_starts(&data, tomoyo_group_name[i]))
+                       return tomoyo_write_group(data, is_delete, i);
+       return -EINVAL;
+}
+
+/**
+ * tomoyo_read_group - Read "struct tomoyo_path_group"/"struct tomoyo_number_group" list.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ * @idx:  Index number.
+ *
+ * Returns true on success, false otherwise.
+ *
+ * Caller holds tomoyo_read_lock().
+ */
+static bool tomoyo_read_group(struct tomoyo_io_buffer *head, const int idx)
+{
+       list_for_each_cookie(head->r.group, &tomoyo_group_list[idx]) {
+               struct tomoyo_group *group =
+                       list_entry(head->r.group, typeof(*group), list);
+               list_for_each_cookie(head->r.acl, &group->member_list) {
+                       struct tomoyo_acl_head *ptr =
+                               list_entry(head->r.acl, typeof(*ptr), list);
+                       if (ptr->is_deleted)
+                               continue;
+                       if (!tomoyo_flush(head))
+                               return false;
+                       tomoyo_set_string(head, tomoyo_group_name[idx]);
+                       tomoyo_set_string(head, group->group_name->name);
+                       if (idx == TOMOYO_PATH_GROUP) {
+                               tomoyo_set_space(head);
+                               tomoyo_set_string(head, container_of
+                                              (ptr, struct tomoyo_path_group,
+                                               head)->member_name->name);
+                       } else if (idx == TOMOYO_NUMBER_GROUP) {
+                               tomoyo_print_number_union(head, &container_of
+                                                         (ptr,
+                                                  struct tomoyo_number_group,
+                                                          head)->number);
+                       }
+                       tomoyo_set_lf(head);
+               }
+               head->r.acl = NULL;
+       }
+       head->r.group = NULL;
+       return true;
+}
+
+/**
+ * tomoyo_read_policy - Read "struct tomoyo_..._entry" list.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
+ * @idx:  Index number.
  *
- * Returns list of profile number and domainname pairs.
- *
- * This is equivalent to doing
- *
- *     grep -A 1 '^<kernel>' /sys/kernel/security/tomoyo/domain_policy |
- *     awk ' { if ( domainname == "" ) { if ( $1 == "<kernel>" )
- *     domainname = $0; } else if ( $1 == "use_profile" ) {
- *     print $2 " " domainname; domainname = ""; } } ; '
+ * Returns true on success, false otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_read_domain_profile(struct tomoyo_io_buffer *head)
+static bool tomoyo_read_policy(struct tomoyo_io_buffer *head, const int idx)
 {
-       struct list_head *pos;
-       bool done = true;
-
-       if (head->read_eof)
-               return 0;
-       list_for_each_cookie(pos, head->read_var1, &tomoyo_domain_list) {
-               struct tomoyo_domain_info *domain;
-               domain = list_entry(pos, struct tomoyo_domain_info, list);
-               if (domain->is_deleted)
+       list_for_each_cookie(head->r.acl, &tomoyo_policy_list[idx]) {
+               struct tomoyo_acl_head *acl =
+                       container_of(head->r.acl, typeof(*acl), list);
+               if (acl->is_deleted)
                        continue;
-               done = tomoyo_io_printf(head, "%u %s\n", domain->profile,
-                                       domain->domainname->name);
-               if (!done)
+               if (!tomoyo_flush(head))
+                       return false;
+               switch (idx) {
+               case TOMOYO_ID_TRANSITION_CONTROL:
+                       {
+                               struct tomoyo_transition_control *ptr =
+                                       container_of(acl, typeof(*ptr), head);
+                               tomoyo_set_string(head,
+                                                 tomoyo_transition_type
+                                                 [ptr->type]);
+                               if (ptr->program)
+                                       tomoyo_set_string(head,
+                                                         ptr->program->name);
+                               if (ptr->program && ptr->domainname)
+                                       tomoyo_set_string(head, " from ");
+                               if (ptr->domainname)
+                                       tomoyo_set_string(head,
+                                                         ptr->domainname->
+                                                         name);
+                       }
+                       break;
+               case TOMOYO_ID_GLOBALLY_READABLE:
+                       {
+                               struct tomoyo_readable_file *ptr =
+                                       container_of(acl, typeof(*ptr), head);
+                               tomoyo_set_string(head,
+                                                 TOMOYO_KEYWORD_ALLOW_READ);
+                               tomoyo_set_string(head, ptr->filename->name);
+                       }
+                       break;
+               case TOMOYO_ID_AGGREGATOR:
+                       {
+                               struct tomoyo_aggregator *ptr =
+                                       container_of(acl, typeof(*ptr), head);
+                               tomoyo_set_string(head,
+                                                 TOMOYO_KEYWORD_AGGREGATOR);
+                               tomoyo_set_string(head,
+                                                 ptr->original_name->name);
+                               tomoyo_set_space(head);
+                               tomoyo_set_string(head,
+                                              ptr->aggregated_name->name);
+                       }
+                       break;
+               case TOMOYO_ID_PATTERN:
+                       {
+                               struct tomoyo_no_pattern *ptr =
+                                       container_of(acl, typeof(*ptr), head);
+                               tomoyo_set_string(head,
+                                                 TOMOYO_KEYWORD_FILE_PATTERN);
+                               tomoyo_set_string(head, ptr->pattern->name);
+                       }
+                       break;
+               case TOMOYO_ID_NO_REWRITE:
+                       {
+                               struct tomoyo_no_rewrite *ptr =
+                                       container_of(acl, typeof(*ptr), head);
+                               tomoyo_set_string(head,
+                                                 TOMOYO_KEYWORD_DENY_REWRITE);
+                               tomoyo_set_string(head, ptr->pattern->name);
+                       }
                        break;
+               default:
+                       continue;
+               }
+               tomoyo_set_lf(head);
        }
-       head->read_eof = done;
-       return 0;
+       head->r.acl = NULL;
+       return true;
 }
 
 /**
- * tomoyo_write_pid: Specify PID to obtain domainname.
+ * tomoyo_read_exception - Read exception policy.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  *
- * Returns 0.
+ * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_write_pid(struct tomoyo_io_buffer *head)
+static void tomoyo_read_exception(struct tomoyo_io_buffer *head)
 {
-       unsigned long pid;
-       /* No error check. */
-       strict_strtoul(head->write_buf, 10, &pid);
-       head->read_step = (int) pid;
-       head->read_eof = false;
-       return 0;
+       if (head->r.eof)
+               return;
+       while (head->r.step < TOMOYO_MAX_POLICY &&
+              tomoyo_read_policy(head, head->r.step))
+               head->r.step++;
+       if (head->r.step < TOMOYO_MAX_POLICY)
+               return;
+       while (head->r.step < TOMOYO_MAX_POLICY + TOMOYO_MAX_GROUP &&
+              tomoyo_read_group(head, head->r.step - TOMOYO_MAX_POLICY))
+               head->r.step++;
+       if (head->r.step < TOMOYO_MAX_POLICY + TOMOYO_MAX_GROUP)
+               return;
+       head->r.eof = true;
 }
 
 /**
- * tomoyo_read_pid - Get domainname of the specified PID.
+ * tomoyo_print_header - Get header line of audit log.
  *
- * @head: Pointer to "struct tomoyo_io_buffer".
+ * @r: Pointer to "struct tomoyo_request_info".
  *
- * Returns the domainname which the specified PID is in on success,
- * empty string otherwise.
- * The PID is specified by tomoyo_write_pid() so that the user can obtain
- * using read()/write() interface rather than sysctl() interface.
+ * Returns string representation.
+ *
+ * This function uses kmalloc(), so caller must kfree() if this function
+ * didn't return NULL.
  */
-static int tomoyo_read_pid(struct tomoyo_io_buffer *head)
+static char *tomoyo_print_header(struct tomoyo_request_info *r)
 {
-       if (head->read_avail == 0 && !head->read_eof) {
-               const int pid = head->read_step;
-               struct task_struct *p;
-               struct tomoyo_domain_info *domain = NULL;
-               rcu_read_lock();
-               read_lock(&tasklist_lock);
-               p = find_task_by_vpid(pid);
-               if (p)
-                       domain = tomoyo_real_domain(p);
-               read_unlock(&tasklist_lock);
-               rcu_read_unlock();
-               if (domain)
-                       tomoyo_io_printf(head, "%d %u %s", pid, domain->profile,
-                                        domain->domainname->name);
-               head->read_eof = true;
-       }
-       return 0;
+       struct timeval tv;
+       const pid_t gpid = task_pid_nr(current);
+       static const int tomoyo_buffer_len = 4096;
+       char *buffer = kmalloc(tomoyo_buffer_len, GFP_NOFS);
+       if (!buffer)
+               return NULL;
+       do_gettimeofday(&tv);
+       snprintf(buffer, tomoyo_buffer_len - 1,
+                "#timestamp=%lu profile=%u mode=%s (global-pid=%u)"
+                " task={ pid=%u ppid=%u uid=%u gid=%u euid=%u"
+                " egid=%u suid=%u sgid=%u fsuid=%u fsgid=%u }",
+                tv.tv_sec, r->profile, tomoyo_mode[r->mode], gpid,
+                (pid_t) sys_getpid(), (pid_t) sys_getppid(),
+                current_uid(), current_gid(), current_euid(),
+                current_egid(), current_suid(), current_sgid(),
+                current_fsuid(), current_fsgid());
+       return buffer;
 }
 
 /**
- * tomoyo_write_exception_policy - Write exception policy.
+ * tomoyo_init_audit_log - Allocate buffer for audit logs.
  *
- * @head: Pointer to "struct tomoyo_io_buffer".
+ * @len: Required size.
+ * @r:   Pointer to "struct tomoyo_request_info".
  *
- * Returns 0 on success, negative value otherwise.
+ * Returns pointer to allocated memory.
  *
- * Caller holds tomoyo_read_lock().
+ * The @len is updated to add the header lines' size on success.
+ *
+ * This function uses kzalloc(), so caller must kfree() if this function
+ * didn't return NULL.
  */
-static int tomoyo_write_exception_policy(struct tomoyo_io_buffer *head)
+static char *tomoyo_init_audit_log(int *len, struct tomoyo_request_info *r)
 {
-       char *data = head->write_buf;
-       bool is_delete = tomoyo_str_starts(&data, TOMOYO_KEYWORD_DELETE);
+       char *buf = NULL;
+       const char *header;
+       const char *domainname;
+       if (!r->domain)
+               r->domain = tomoyo_domain();
+       domainname = r->domain->domainname->name;
+       header = tomoyo_print_header(r);
+       if (!header)
+               return NULL;
+       *len += strlen(domainname) + strlen(header) + 10;
+       buf = kzalloc(*len, GFP_NOFS);
+       if (buf)
+               snprintf(buf, (*len) - 1, "%s\n%s\n", header, domainname);
+       kfree(header);
+       return buf;
+}
 
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_KEEP_DOMAIN))
-               return tomoyo_write_domain_keeper_policy(data, false,
-                                                        is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_NO_KEEP_DOMAIN))
-               return tomoyo_write_domain_keeper_policy(data, true, is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_INITIALIZE_DOMAIN))
-               return tomoyo_write_domain_initializer_policy(data, false,
-                                                             is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_NO_INITIALIZE_DOMAIN))
-               return tomoyo_write_domain_initializer_policy(data, true,
-                                                             is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_ALIAS))
-               return tomoyo_write_alias_policy(data, is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_ALLOW_READ))
-               return tomoyo_write_globally_readable_policy(data, is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_FILE_PATTERN))
-               return tomoyo_write_pattern_policy(data, is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_DENY_REWRITE))
-               return tomoyo_write_no_rewrite_policy(data, is_delete);
-       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_PATH_GROUP))
-               return tomoyo_write_path_group_policy(data, is_delete);
-       return -EINVAL;
+/* Wait queue for tomoyo_query_list. */
+static DECLARE_WAIT_QUEUE_HEAD(tomoyo_query_wait);
+
+/* Lock for manipulating tomoyo_query_list. */
+static DEFINE_SPINLOCK(tomoyo_query_list_lock);
+
+/* Structure for query. */
+struct tomoyo_query {
+       struct list_head list;
+       char *query;
+       int query_len;
+       unsigned int serial;
+       int timer;
+       int answer;
+};
+
+/* The list for "struct tomoyo_query". */
+static LIST_HEAD(tomoyo_query_list);
+
+/*
+ * Number of "struct file" referring /sys/kernel/security/tomoyo/query
+ * interface.
+ */
+static atomic_t tomoyo_query_observers = ATOMIC_INIT(0);
+
+/**
+ * tomoyo_supervisor - Ask for the supervisor's decision.
+ *
+ * @r:       Pointer to "struct tomoyo_request_info".
+ * @fmt:     The printf()'s format string, followed by parameters.
+ *
+ * Returns 0 if the supervisor decided to permit the access request which
+ * violated the policy in enforcing mode, TOMOYO_RETRY_REQUEST if the
+ * supervisor decided to retry the access request which violated the policy in
+ * enforcing mode, 0 if it is not in enforcing mode, -EPERM otherwise.
+ */
+int tomoyo_supervisor(struct tomoyo_request_info *r, const char *fmt, ...)
+{
+       va_list args;
+       int error = -EPERM;
+       int pos;
+       int len;
+       static unsigned int tomoyo_serial;
+       struct tomoyo_query *entry = NULL;
+       bool quota_exceeded = false;
+       char *header;
+       switch (r->mode) {
+               char *buffer;
+       case TOMOYO_CONFIG_LEARNING:
+               if (!tomoyo_domain_quota_is_ok(r))
+                       return 0;
+               va_start(args, fmt);
+               len = vsnprintf((char *) &pos, sizeof(pos) - 1, fmt, args) + 4;
+               va_end(args);
+               buffer = kmalloc(len, GFP_NOFS);
+               if (!buffer)
+                       return 0;
+               va_start(args, fmt);
+               vsnprintf(buffer, len - 1, fmt, args);
+               va_end(args);
+               tomoyo_normalize_line(buffer);
+               tomoyo_write_domain2(buffer, r->domain, false);
+               kfree(buffer);
+               /* fall through */
+       case TOMOYO_CONFIG_PERMISSIVE:
+               return 0;
+       }
+       if (!r->domain)
+               r->domain = tomoyo_domain();
+       if (!atomic_read(&tomoyo_query_observers))
+               return -EPERM;
+       va_start(args, fmt);
+       len = vsnprintf((char *) &pos, sizeof(pos) - 1, fmt, args) + 32;
+       va_end(args);
+       header = tomoyo_init_audit_log(&len, r);
+       if (!header)
+               goto out;
+       entry = kzalloc(sizeof(*entry), GFP_NOFS);
+       if (!entry)
+               goto out;
+       entry->query = kzalloc(len, GFP_NOFS);
+       if (!entry->query)
+               goto out;
+       len = ksize(entry->query);
+       spin_lock(&tomoyo_query_list_lock);
+       if (tomoyo_quota_for_query && tomoyo_query_memory_size + len +
+           sizeof(*entry) >= tomoyo_quota_for_query) {
+               quota_exceeded = true;
+       } else {
+               tomoyo_query_memory_size += len + sizeof(*entry);
+               entry->serial = tomoyo_serial++;
+       }
+       spin_unlock(&tomoyo_query_list_lock);
+       if (quota_exceeded)
+               goto out;
+       pos = snprintf(entry->query, len - 1, "Q%u-%hu\n%s",
+                      entry->serial, r->retry, header);
+       kfree(header);
+       header = NULL;
+       va_start(args, fmt);
+       vsnprintf(entry->query + pos, len - 1 - pos, fmt, args);
+       entry->query_len = strlen(entry->query) + 1;
+       va_end(args);
+       spin_lock(&tomoyo_query_list_lock);
+       list_add_tail(&entry->list, &tomoyo_query_list);
+       spin_unlock(&tomoyo_query_list_lock);
+       /* Give 10 seconds for supervisor's opinion. */
+       for (entry->timer = 0;
+            atomic_read(&tomoyo_query_observers) && entry->timer < 100;
+            entry->timer++) {
+               wake_up(&tomoyo_query_wait);
+               set_current_state(TASK_INTERRUPTIBLE);
+               schedule_timeout(HZ / 10);
+               if (entry->answer)
+                       break;
+       }
+       spin_lock(&tomoyo_query_list_lock);
+       list_del(&entry->list);
+       tomoyo_query_memory_size -= len + sizeof(*entry);
+       spin_unlock(&tomoyo_query_list_lock);
+       switch (entry->answer) {
+       case 3: /* Asked to retry by administrator. */
+               error = TOMOYO_RETRY_REQUEST;
+               r->retry++;
+               break;
+       case 1:
+               /* Granted by administrator. */
+               error = 0;
+               break;
+       case 0:
+               /* Timed out. */
+               break;
+       default:
+               /* Rejected by administrator. */
+               break;
+       }
+ out:
+       if (entry)
+               kfree(entry->query);
+       kfree(entry);
+       kfree(header);
+       return error;
 }
 
 /**
- * tomoyo_read_exception_policy - Read exception policy.
+ * tomoyo_poll_query - poll() for /sys/kernel/security/tomoyo/query.
  *
- * @head: Pointer to "struct tomoyo_io_buffer".
+ * @file: Pointer to "struct file".
+ * @wait: Pointer to "poll_table".
  *
- * Returns 0 on success, -EINVAL otherwise.
+ * Returns POLLIN | POLLRDNORM when ready to read, 0 otherwise.
  *
- * Caller holds tomoyo_read_lock().
+ * Waits for access requests which violated policy in enforcing mode.
  */
-static int tomoyo_read_exception_policy(struct tomoyo_io_buffer *head)
+static int tomoyo_poll_query(struct file *file, poll_table *wait)
 {
-       if (!head->read_eof) {
-               switch (head->read_step) {
-               case 0:
-                       head->read_var2 = NULL;
-                       head->read_step = 1;
-               case 1:
-                       if (!tomoyo_read_domain_keeper_policy(head))
-                               break;
-                       head->read_var2 = NULL;
-                       head->read_step = 2;
-               case 2:
-                       if (!tomoyo_read_globally_readable_policy(head))
-                               break;
-                       head->read_var2 = NULL;
-                       head->read_step = 3;
-               case 3:
-                       head->read_var2 = NULL;
-                       head->read_step = 4;
-               case 4:
-                       if (!tomoyo_read_domain_initializer_policy(head))
-                               break;
-                       head->read_var2 = NULL;
-                       head->read_step = 5;
-               case 5:
-                       if (!tomoyo_read_alias_policy(head))
-                               break;
-                       head->read_var2 = NULL;
-                       head->read_step = 6;
-               case 6:
-                       head->read_var2 = NULL;
-                       head->read_step = 7;
-               case 7:
-                       if (!tomoyo_read_file_pattern(head))
-                               break;
-                       head->read_var2 = NULL;
-                       head->read_step = 8;
-               case 8:
-                       if (!tomoyo_read_no_rewrite_policy(head))
-                               break;
-                       head->read_var2 = NULL;
-                       head->read_step = 9;
-               case 9:
-                       if (!tomoyo_read_path_group_policy(head))
-                               break;
-                       head->read_var1 = NULL;
-                       head->read_var2 = NULL;
-                       head->read_step = 10;
-               case 10:
-                       head->read_eof = true;
+       struct list_head *tmp;
+       bool found = false;
+       u8 i;
+       for (i = 0; i < 2; i++) {
+               spin_lock(&tomoyo_query_list_lock);
+               list_for_each(tmp, &tomoyo_query_list) {
+                       struct tomoyo_query *ptr =
+                               list_entry(tmp, typeof(*ptr), list);
+                       if (ptr->answer)
+                               continue;
+                       found = true;
                        break;
-               default:
-                       return -EINVAL;
                }
+               spin_unlock(&tomoyo_query_list_lock);
+               if (found)
+                       return POLLIN | POLLRDNORM;
+               if (i)
+                       break;
+               poll_wait(file, &tomoyo_query_wait, wait);
        }
        return 0;
 }
 
-/* path to policy loader */
-static const char *tomoyo_loader = "/sbin/tomoyo-init";
-
 /**
- * tomoyo_policy_loader_exists - Check whether /sbin/tomoyo-init exists.
+ * tomoyo_read_query - Read access requests which violated policy in enforcing mode.
  *
- * Returns true if /sbin/tomoyo-init exists, false otherwise.
+ * @head: Pointer to "struct tomoyo_io_buffer".
  */
-static bool tomoyo_policy_loader_exists(void)
+static void tomoyo_read_query(struct tomoyo_io_buffer *head)
 {
-       /*
-        * Don't activate MAC if the policy loader doesn't exist.
-        * If the initrd includes /sbin/init but real-root-dev has not
-        * mounted on / yet, activating MAC will block the system since
-        * policies are not loaded yet.
-        * Thus, let do_execve() call this function everytime.
-        */
-       struct path path;
-
-       if (kern_path(tomoyo_loader, LOOKUP_FOLLOW, &path)) {
-               printk(KERN_INFO "Not activating Mandatory Access Control now "
-                      "since %s doesn't exist.\n", tomoyo_loader);
-               return false;
+       struct list_head *tmp;
+       int pos = 0;
+       int len = 0;
+       char *buf;
+       if (head->r.w_pos)
+               return;
+       if (head->read_buf) {
+               kfree(head->read_buf);
+               head->read_buf = NULL;
+       }
+       spin_lock(&tomoyo_query_list_lock);
+       list_for_each(tmp, &tomoyo_query_list) {
+               struct tomoyo_query *ptr = list_entry(tmp, typeof(*ptr), list);
+               if (ptr->answer)
+                       continue;
+               if (pos++ != head->r.query_index)
+                       continue;
+               len = ptr->query_len;
+               break;
+       }
+       spin_unlock(&tomoyo_query_list_lock);
+       if (!len) {
+               head->r.query_index = 0;
+               return;
+       }
+       buf = kzalloc(len, GFP_NOFS);
+       if (!buf)
+               return;
+       pos = 0;
+       spin_lock(&tomoyo_query_list_lock);
+       list_for_each(tmp, &tomoyo_query_list) {
+               struct tomoyo_query *ptr = list_entry(tmp, typeof(*ptr), list);
+               if (ptr->answer)
+                       continue;
+               if (pos++ != head->r.query_index)
+                       continue;
+               /*
+                * Some query can be skipped because tomoyo_query_list
+                * can change, but I don't care.
+                */
+               if (len == ptr->query_len)
+                       memmove(buf, ptr->query, len);
+               break;
+       }
+       spin_unlock(&tomoyo_query_list_lock);
+       if (buf[0]) {
+               head->read_buf = buf;
+               head->r.w[head->r.w_pos++] = buf;
+               head->r.query_index++;
+       } else {
+               kfree(buf);
        }
-       path_put(&path);
-       return true;
 }
 
 /**
- * tomoyo_load_policy - Run external policy loader to load policy.
+ * tomoyo_write_answer - Write the supervisor's decision.
  *
- * @filename: The program about to start.
- *
- * This function checks whether @filename is /sbin/init , and if so
- * invoke /sbin/tomoyo-init and wait for the termination of /sbin/tomoyo-init
- * and then continues invocation of /sbin/init.
- * /sbin/tomoyo-init reads policy files in /etc/tomoyo/ directory and
- * writes to /sys/kernel/security/tomoyo/ interfaces.
+ * @head: Pointer to "struct tomoyo_io_buffer".
  *
- * Returns nothing.
+ * Returns 0 on success, -EINVAL otherwise.
  */
-void tomoyo_load_policy(const char *filename)
+static int tomoyo_write_answer(struct tomoyo_io_buffer *head)
 {
-       char *argv[2];
-       char *envp[3];
-
-       if (tomoyo_policy_loaded)
-               return;
-       /*
-        * Check filename is /sbin/init or /sbin/tomoyo-start.
-        * /sbin/tomoyo-start is a dummy filename in case where /sbin/init can't
-        * be passed.
-        * You can create /sbin/tomoyo-start by
-        * "ln -s /bin/true /sbin/tomoyo-start".
-        */
-       if (strcmp(filename, "/sbin/init") &&
-           strcmp(filename, "/sbin/tomoyo-start"))
-               return;
-       if (!tomoyo_policy_loader_exists())
-               return;
-
-       printk(KERN_INFO "Calling %s to load policy. Please wait.\n",
-              tomoyo_loader);
-       argv[0] = (char *) tomoyo_loader;
-       argv[1] = NULL;
-       envp[0] = "HOME=/";
-       envp[1] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
-       envp[2] = NULL;
-       call_usermodehelper(argv[0], argv, envp, 1);
-
-       printk(KERN_INFO "TOMOYO: 2.2.0   2009/04/01\n");
-       printk(KERN_INFO "Mandatory Access Control activated.\n");
-       tomoyo_policy_loaded = true;
-       { /* Check all profiles currently assigned to domains are defined. */
-               struct tomoyo_domain_info *domain;
-               list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
-                       const u8 profile = domain->profile;
-                       if (tomoyo_profile_ptr[profile])
-                               continue;
-                       panic("Profile %u (used by '%s') not defined.\n",
-                             profile, domain->domainname->name);
-               }
+       char *data = head->write_buf;
+       struct list_head *tmp;
+       unsigned int serial;
+       unsigned int answer;
+       spin_lock(&tomoyo_query_list_lock);
+       list_for_each(tmp, &tomoyo_query_list) {
+               struct tomoyo_query *ptr = list_entry(tmp, typeof(*ptr), list);
+               ptr->timer = 0;
        }
+       spin_unlock(&tomoyo_query_list_lock);
+       if (sscanf(data, "A%u=%u", &serial, &answer) != 2)
+               return -EINVAL;
+       spin_lock(&tomoyo_query_list_lock);
+       list_for_each(tmp, &tomoyo_query_list) {
+               struct tomoyo_query *ptr = list_entry(tmp, typeof(*ptr), list);
+               if (ptr->serial != serial)
+                       continue;
+               if (!ptr->answer)
+                       ptr->answer = answer;
+               break;
+       }
+       spin_unlock(&tomoyo_query_list_lock);
+       return 0;
 }
 
 /**
@@ -1913,13 +1744,12 @@ void tomoyo_load_policy(const char *filename)
  *
  * Returns version information.
  */
-static int tomoyo_read_version(struct tomoyo_io_buffer *head)
+static void tomoyo_read_version(struct tomoyo_io_buffer *head)
 {
-       if (!head->read_eof) {
-               tomoyo_io_printf(head, "2.2.0");
-               head->read_eof = true;
+       if (!head->r.eof) {
+               tomoyo_io_printf(head, "2.3.0");
+               head->r.eof = true;
        }
-       return 0;
 }
 
 /**
@@ -1929,18 +1759,17 @@ static int tomoyo_read_version(struct tomoyo_io_buffer *head)
  *
  * Returns the current process's domainname.
  */
-static int tomoyo_read_self_domain(struct tomoyo_io_buffer *head)
+static void tomoyo_read_self_domain(struct tomoyo_io_buffer *head)
 {
-       if (!head->read_eof) {
+       if (!head->r.eof) {
                /*
                 * tomoyo_domain()->domainname != NULL
                 * because every process belongs to a domain and
                 * the domain's name cannot be NULL.
                 */
                tomoyo_io_printf(head, "%s", tomoyo_domain()->domainname->name);
-               head->read_eof = true;
+               head->r.eof = true;
        }
-       return 0;
 }
 
 /**
@@ -1953,23 +1782,24 @@ static int tomoyo_read_self_domain(struct tomoyo_io_buffer *head)
  *
  * Caller acquires tomoyo_read_lock().
  */
-static int tomoyo_open_control(const u8 type, struct file *file)
+int tomoyo_open_control(const u8 type, struct file *file)
 {
        struct tomoyo_io_buffer *head = kzalloc(sizeof(*head), GFP_NOFS);
 
        if (!head)
                return -ENOMEM;
        mutex_init(&head->io_sem);
+       head->type = type;
        switch (type) {
        case TOMOYO_DOMAINPOLICY:
                /* /sys/kernel/security/tomoyo/domain_policy */
-               head->write = tomoyo_write_domain_policy;
-               head->read = tomoyo_read_domain_policy;
+               head->write = tomoyo_write_domain;
+               head->read = tomoyo_read_domain;
                break;
        case TOMOYO_EXCEPTIONPOLICY:
                /* /sys/kernel/security/tomoyo/exception_policy */
-               head->write = tomoyo_write_exception_policy;
-               head->read = tomoyo_read_exception_policy;
+               head->write = tomoyo_write_exception;
+               head->read = tomoyo_read_exception;
                break;
        case TOMOYO_SELFDOMAIN:
                /* /sys/kernel/security/tomoyo/self_domain */
@@ -2001,10 +1831,15 @@ static int tomoyo_open_control(const u8 type, struct file *file)
                head->write = tomoyo_write_profile;
                head->read = tomoyo_read_profile;
                break;
+       case TOMOYO_QUERY: /* /sys/kernel/security/tomoyo/query */
+               head->poll = tomoyo_poll_query;
+               head->write = tomoyo_write_answer;
+               head->read = tomoyo_read_query;
+               break;
        case TOMOYO_MANAGER:
                /* /sys/kernel/security/tomoyo/manager */
-               head->write = tomoyo_write_manager_policy;
-               head->read = tomoyo_read_manager_policy;
+               head->write = tomoyo_write_manager;
+               head->read = tomoyo_read_manager;
                break;
        }
        if (!(file->f_mode & FMODE_READ)) {
@@ -2013,7 +1848,9 @@ static int tomoyo_open_control(const u8 type, struct file *file)
                 * for reading.
                 */
                head->read = NULL;
-       } else {
+               head->poll = NULL;
+       } else if (!head->poll) {
+               /* Don't allocate read_buf for poll() access. */
                if (!head->readbuf_size)
                        head->readbuf_size = 4096 * 2;
                head->read_buf = kzalloc(head->readbuf_size, GFP_NOFS);
@@ -2037,7 +1874,8 @@ static int tomoyo_open_control(const u8 type, struct file *file)
                        return -ENOMEM;
                }
        }
-       head->reader_idx = tomoyo_read_lock();
+       if (type != TOMOYO_QUERY)
+               head->reader_idx = tomoyo_read_lock();
        file->private_data = head;
        /*
         * Call the handler now if the file is
@@ -2048,9 +1886,34 @@ static int tomoyo_open_control(const u8 type, struct file *file)
         */
        if (type == TOMOYO_SELFDOMAIN)
                tomoyo_read_control(file, NULL, 0);
+       /*
+        * If the file is /sys/kernel/security/tomoyo/query , increment the
+        * observer counter.
+        * The obserber counter is used by tomoyo_supervisor() to see if
+        * there is some process monitoring /sys/kernel/security/tomoyo/query.
+        */
+       else if (type == TOMOYO_QUERY)
+               atomic_inc(&tomoyo_query_observers);
        return 0;
 }
 
+/**
+ * tomoyo_poll_control - poll() for /sys/kernel/security/tomoyo/ interface.
+ *
+ * @file: Pointer to "struct file".
+ * @wait: Pointer to "poll_table".
+ *
+ * Waits for read readiness.
+ * /sys/kernel/security/tomoyo/query is handled by /usr/sbin/tomoyo-queryd .
+ */
+int tomoyo_poll_control(struct file *file, poll_table *wait)
+{
+       struct tomoyo_io_buffer *head = file->private_data;
+       if (!head->poll)
+               return -ENOSYS;
+       return head->poll(file, wait);
+}
+
 /**
  * tomoyo_read_control - read() for /sys/kernel/security/tomoyo/ interface.
  *
@@ -2062,36 +1925,23 @@ static int tomoyo_open_control(const u8 type, struct file *file)
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_read_control(struct file *file, char __user *buffer,
-                              const int buffer_len)
+int tomoyo_read_control(struct file *file, char __user *buffer,
+                       const int buffer_len)
 {
-       int len = 0;
+       int len;
        struct tomoyo_io_buffer *head = file->private_data;
-       char *cp;
 
        if (!head->read)
                return -ENOSYS;
        if (mutex_lock_interruptible(&head->io_sem))
                return -EINTR;
-       /* Call the policy handler. */
-       len = head->read(head);
-       if (len < 0)
-               goto out;
-       /* Write to buffer. */
-       len = head->read_avail;
-       if (len > buffer_len)
-               len = buffer_len;
-       if (!len)
-               goto out;
-       /* head->read_buf changes by some functions. */
-       cp = head->read_buf;
-       if (copy_to_user(buffer, cp, len)) {
-               len = -EFAULT;
-               goto out;
-       }
-       head->read_avail -= len;
-       memmove(cp, cp + len, head->read_avail);
- out:
+       head->read_user_buf = buffer;
+       head->read_user_buf_avail = buffer_len;
+       if (tomoyo_flush(head))
+               /* Call the policy handler. */
+               head->read(head);
+       tomoyo_flush(head);
+       len = head->read_user_buf - buffer;
        mutex_unlock(&head->io_sem);
        return len;
 }
@@ -2107,8 +1957,8 @@ static int tomoyo_read_control(struct file *file, char __user *buffer,
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_write_control(struct file *file, const char __user *buffer,
-                               const int buffer_len)
+int tomoyo_write_control(struct file *file, const char __user *buffer,
+                        const int buffer_len)
 {
        struct tomoyo_io_buffer *head = file->private_data;
        int error = buffer_len;
@@ -2121,8 +1971,7 @@ static int tomoyo_write_control(struct file *file, const char __user *buffer,
                return -EFAULT;
        /* Don't allow updating policies by non manager programs. */
        if (head->write != tomoyo_write_pid &&
-           head->write != tomoyo_write_domain_policy &&
-           !tomoyo_is_policy_manager())
+           head->write != tomoyo_write_domain && !tomoyo_manager())
                return -EPERM;
        if (mutex_lock_interruptible(&head->io_sem))
                return -EINTR;
@@ -2159,12 +2008,19 @@ static int tomoyo_write_control(struct file *file, const char __user *buffer,
  *
  * Caller looses tomoyo_read_lock().
  */
-static int tomoyo_close_control(struct file *file)
+int tomoyo_close_control(struct file *file)
 {
        struct tomoyo_io_buffer *head = file->private_data;
        const bool is_write = !!head->write_buf;
 
-       tomoyo_read_unlock(head->reader_idx);
+       /*
+        * If the file is /sys/kernel/security/tomoyo/query , decrement the
+        * observer counter.
+        */
+       if (head->type == TOMOYO_QUERY)
+               atomic_dec(&tomoyo_query_observers);
+       else
+               tomoyo_read_unlock(head->reader_idx);
        /* Release memory used for policy I/O. */
        kfree(head->read_buf);
        head->read_buf = NULL;
@@ -2179,129 +2035,25 @@ static int tomoyo_close_control(struct file *file)
 }
 
 /**
- * tomoyo_open - open() for /sys/kernel/security/tomoyo/ interface.
- *
- * @inode: Pointer to "struct inode".
- * @file:  Pointer to "struct file".
- *
- * Returns 0 on success, negative value otherwise.
- */
-static int tomoyo_open(struct inode *inode, struct file *file)
-{
-       const int key = ((u8 *) file->f_path.dentry->d_inode->i_private)
-               - ((u8 *) NULL);
-       return tomoyo_open_control(key, file);
-}
-
-/**
- * tomoyo_release - close() for /sys/kernel/security/tomoyo/ interface.
- *
- * @inode: Pointer to "struct inode".
- * @file:  Pointer to "struct file".
- *
- * Returns 0 on success, negative value otherwise.
- */
-static int tomoyo_release(struct inode *inode, struct file *file)
-{
-       return tomoyo_close_control(file);
-}
-
-/**
- * tomoyo_read - read() for /sys/kernel/security/tomoyo/ interface.
- *
- * @file:  Pointer to "struct file".
- * @buf:   Pointer to buffer.
- * @count: Size of @buf.
- * @ppos:  Unused.
- *
- * Returns bytes read on success, negative value otherwise.
- */
-static ssize_t tomoyo_read(struct file *file, char __user *buf, size_t count,
-                          loff_t *ppos)
-{
-       return tomoyo_read_control(file, buf, count);
-}
-
-/**
- * tomoyo_write - write() for /sys/kernel/security/tomoyo/ interface.
- *
- * @file:  Pointer to "struct file".
- * @buf:   Pointer to buffer.
- * @count: Size of @buf.
- * @ppos:  Unused.
- *
- * Returns @count on success, negative value otherwise.
- */
-static ssize_t tomoyo_write(struct file *file, const char __user *buf,
-                           size_t count, loff_t *ppos)
-{
-       return tomoyo_write_control(file, buf, count);
-}
-
-/*
- * tomoyo_operations is a "struct file_operations" which is used for handling
- * /sys/kernel/security/tomoyo/ interface.
- *
- * Some files under /sys/kernel/security/tomoyo/ directory accept open(O_RDWR).
- * See tomoyo_io_buffer for internals.
- */
-static const struct file_operations tomoyo_operations = {
-       .open    = tomoyo_open,
-       .release = tomoyo_release,
-       .read    = tomoyo_read,
-       .write   = tomoyo_write,
-};
-
-/**
- * tomoyo_create_entry - Create interface files under /sys/kernel/security/tomoyo/ directory.
- *
- * @name:   The name of the interface file.
- * @mode:   The permission of the interface file.
- * @parent: The parent directory.
- * @key:    Type of interface.
- *
- * Returns nothing.
- */
-static void __init tomoyo_create_entry(const char *name, const mode_t mode,
-                                      struct dentry *parent, const u8 key)
-{
-       securityfs_create_file(name, mode, parent, ((u8 *) NULL) + key,
-                              &tomoyo_operations);
-}
-
-/**
- * tomoyo_initerface_init - Initialize /sys/kernel/security/tomoyo/ interface.
- *
- * Returns 0.
+ * tomoyo_check_profile - Check all profiles currently assigned to domains are defined.
  */
-static int __init tomoyo_initerface_init(void)
+void tomoyo_check_profile(void)
 {
-       struct dentry *tomoyo_dir;
-
-       /* Don't create securityfs entries unless registered. */
-       if (current_cred()->security != &tomoyo_kernel_domain)
-               return 0;
-
-       tomoyo_dir = securityfs_create_dir("tomoyo", NULL);
-       tomoyo_create_entry("domain_policy",    0600, tomoyo_dir,
-                           TOMOYO_DOMAINPOLICY);
-       tomoyo_create_entry("exception_policy", 0600, tomoyo_dir,
-                           TOMOYO_EXCEPTIONPOLICY);
-       tomoyo_create_entry("self_domain",      0400, tomoyo_dir,
-                           TOMOYO_SELFDOMAIN);
-       tomoyo_create_entry(".domain_status",   0600, tomoyo_dir,
-                           TOMOYO_DOMAIN_STATUS);
-       tomoyo_create_entry(".process_status",  0600, tomoyo_dir,
-                           TOMOYO_PROCESS_STATUS);
-       tomoyo_create_entry("meminfo",          0600, tomoyo_dir,
-                           TOMOYO_MEMINFO);
-       tomoyo_create_entry("profile",          0600, tomoyo_dir,
-                           TOMOYO_PROFILE);
-       tomoyo_create_entry("manager",          0600, tomoyo_dir,
-                           TOMOYO_MANAGER);
-       tomoyo_create_entry("version",          0400, tomoyo_dir,
-                           TOMOYO_VERSION);
-       return 0;
+       struct tomoyo_domain_info *domain;
+       const int idx = tomoyo_read_lock();
+       tomoyo_policy_loaded = true;
+       /* Check all profiles currently assigned to domains are defined. */
+       list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
+               const u8 profile = domain->profile;
+               if (tomoyo_profile_ptr[profile])
+                       continue;
+               panic("Profile %u (used by '%s') not defined.\n",
+                     profile, domain->domainname->name);
+       }
+       tomoyo_read_unlock(idx);
+       if (tomoyo_profile_version != 20090903)
+               panic("Profile version %u is not supported.\n",
+                     tomoyo_profile_version);
+       printk(KERN_INFO "TOMOYO: 2.3.0\n");
+       printk(KERN_INFO "Mandatory Access Control activated.\n");
 }
-
-fs_initcall(tomoyo_initerface_init);