TOMOYO: Allow wildcard for execute permission.
[deliverable/linux.git] / security / tomoyo / common.c
index 975c45d88baad581d77dbc88be9048854c44ad83..3f94011c64119776cf60f6d5527a0fa78f3289a9 100644 (file)
@@ -3,10 +3,7 @@
  *
  * 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/hardirq.h>
 #include "common.h"
 
-/* Lock for protecting policy. */
-DEFINE_MUTEX(tomoyo_policy_lock);
-
-/* Has loading policy done? */
-bool tomoyo_policy_loaded;
-
 /* String table for functionality that takes 4 modes. */
 static const char *tomoyo_mode_4[4] = {
        "disabled", "learning", "permissive", "enforcing"
@@ -64,646 +55,74 @@ 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_is_byte_range - Check whether the string isa \ooo style octal value.
+ * tomoyo_print_name_union - Print a tomoyo_name_union.
  *
- * @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)
-{
-       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.
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ * @ptr:  Pointer to "struct tomoyo_name_union".
  *
- * Returns byte value.
+ * Returns true on success, false otherwise.
  */
-static inline u8 tomoyo_make_byte(const u8 c1, const u8 c2, const u8 c3)
+static bool tomoyo_print_name_union(struct tomoyo_io_buffer *head,
+                                const struct tomoyo_name_union *ptr)
 {
-       return ((c1 - '0') << 6) + ((c2 - '0') << 3) + (c3 - '0');
+       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);
 }
 
 /**
- * tomoyo_str_starts - Check whether the given string starts with the given keyword.
+ * tomoyo_print_number_union - Print a tomoyo_number_union.
  *
- * @src:  Pointer to pointer to the string.
- * @find: Pointer to the keyword.
+ * @head:       Pointer to "struct tomoyo_io_buffer".
+ * @ptr:        Pointer to "struct tomoyo_number_union".
  *
- * Returns true if @src starts with @find, false otherwise.
- *
- * The @src is updated to point the first character after the @find
- * if @src starts with @find.
+ * Returns true on success, false otherwise.
  */
-static bool tomoyo_str_starts(char **src, const char *find)
+bool tomoyo_print_number_union(struct tomoyo_io_buffer *head,
+                              const struct tomoyo_number_union *ptr)
 {
-       const int len = strlen(find);
-       char *tmp = *src;
-
-       if (strncmp(tmp, find, len))
+       unsigned long min;
+       unsigned long max;
+       u8 min_type;
+       u8 max_type;
+       if (!tomoyo_io_printf(head, " "))
                return false;
-       tmp += len;
-       *src = tmp;
-       return true;
-}
-
-/**
- * tomoyo_normalize_line - Format string.
- *
- * @buffer: The line to normalize.
- *
- * Leading and trailing whitespaces are removed.
- * Multiple whitespaces are packed into single space.
- *
- * Returns nothing.
- */
-static void tomoyo_normalize_line(unsigned char *buffer)
-{
-       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';
-}
-
-/**
- * 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.
- */
-bool tomoyo_is_correct_path(const char *filename, const s8 start_type,
-                           const s8 pattern_type, const s8 end_type)
-{
-       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;
-       }
-       if (in_repetition)
-               goto out;
-       return true;
- out:
-       return false;
-}
-
-/**
- * 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)
-{
-       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_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)
-{
-       return !strncmp(buffer, TOMOYO_ROOT_NAME, TOMOYO_ROOT_NAME_LEN);
-}
-
-/**
- * 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.
- *
- * Caller holds tomoyo_read_lock().
- */
-struct tomoyo_domain_info *tomoyo_find_domain(const char *domainname)
-{
-       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;
-       }
-       return NULL;
-}
-
-/**
- * tomoyo_const_part_length - Evaluate the initial length without a pattern in a token.
- *
- * @filename: The string to evaluate.
- *
- * Returns the initial length without a pattern in @filename.
- */
-static int tomoyo_const_part_length(const char *filename)
-{
-       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')
-                               break;
-                       c = *filename++;
-                       if (c < '0' || c > '7')
-                               break;
-                       len += 4;
-                       continue;
-               }
+       if (ptr->is_group)
+               return tomoyo_io_printf(head, "@%s",
+                                       ptr->group->group_name->name);
+       min_type = ptr->min_type;
+       max_type = ptr->max_type;
+       min = ptr->values[0];
+       max = ptr->values[1];
+       switch (min_type) {
+       case TOMOYO_VALUE_TYPE_HEXADECIMAL:
+               if (!tomoyo_io_printf(head, "0x%lX", min))
+                       return false;
                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;
-                               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. */
-               }
-               filename++;
-               pattern++;
-       }
-       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.
- *
- * 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)
+       case TOMOYO_VALUE_TYPE_OCTAL:
+               if (!tomoyo_io_printf(head, "0%lo", min))
                        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.
- *
- * Returns true if @f matches @p, false otherwise.
- */
-static bool tomoyo_path_matches_pattern2(const char *f, const char *p)
-{
-       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))
+               break;
+       default:
+               if (!tomoyo_io_printf(head, "%lu", min))
                        return false;
-               f = f_delimiter;
-               if (*f)
-                       f++;
-               p = p_delimiter;
-               if (*p)
-                       p++;
+               break;
+       }
+       if (min == max && min_type == max_type)
+               return true;
+       switch (max_type) {
+       case TOMOYO_VALUE_TYPE_HEXADECIMAL:
+               return tomoyo_io_printf(head, "-0x%lX", max);
+       case TOMOYO_VALUE_TYPE_OCTAL:
+               return tomoyo_io_printf(head, "-0%lo", max);
+       default:
+               return tomoyo_io_printf(head, "-%lu", max);
        }
-       /* 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);
 }
 
 /**
@@ -734,48 +153,6 @@ bool tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...)
        return true;
 }
 
-/**
- * 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)
-{
-       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;
-               }
-       }
-       up_read(&mm->mmap_sem);
-       return cp;
-}
-
-/**
- * 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)
-{
-       if (is_enforce)
-               return "ERROR";
-       else
-               return "WARNING";
-}
-
 /**
  * tomoyo_check_flags - Check mode for specified functionality.
  *
@@ -814,56 +191,6 @@ bool tomoyo_verbose_mode(const struct tomoyo_domain_info *domain)
        return tomoyo_check_flags(domain, TOMOYO_VERBOSE) != 0;
 }
 
-/**
- * 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)
-{
-       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;
-               }
-       }
-       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);
-       }
-       return false;
-}
-
 /**
  * tomoyo_find_or_assign_new_profile - Create a new profile.
  *
@@ -874,17 +201,17 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_domain_info * const domain)
 static struct tomoyo_profile *tomoyo_find_or_assign_new_profile(const unsigned
                                                                int profile)
 {
-       static DEFINE_MUTEX(lock);
        struct tomoyo_profile *ptr = NULL;
        int i;
 
        if (profile >= TOMOYO_MAX_PROFILES)
                return NULL;
-       mutex_lock(&lock);
+       if (mutex_lock_interruptible(&tomoyo_policy_lock))
+               return NULL;
        ptr = tomoyo_profile_ptr[profile];
        if (ptr)
                goto ok;
-       ptr = kmalloc(sizeof(*ptr), GFP_KERNEL);
+       ptr = kmalloc(sizeof(*ptr), GFP_NOFS);
        if (!tomoyo_memory_ok(ptr)) {
                kfree(ptr);
                ptr = NULL;
@@ -895,7 +222,7 @@ static struct tomoyo_profile *tomoyo_find_or_assign_new_profile(const unsigned
        mb(); /* Avoid out-of-order execution. */
        tomoyo_profile_ptr[profile] = ptr;
  ok:
-       mutex_unlock(&lock);
+       mutex_unlock(&tomoyo_policy_lock);
        return ptr;
 }
 
@@ -1039,7 +366,7 @@ static int tomoyo_read_profile(struct tomoyo_io_buffer *head)
  *
  *  or
  *
- * # echo '/usr/lib/ccs/editpolicy' > /sys/kernel/security/tomoyo/manager
+ * # echo '/usr/sbin/tomoyo-editpolicy' > /sys/kernel/security/tomoyo/manager
  *  (if you want to specify by a program's location)
  *
  * and is deleted by
@@ -1049,7 +376,7 @@ static int tomoyo_read_profile(struct tomoyo_io_buffer *head)
  *
  *  or
  *
- * # echo 'delete /usr/lib/ccs/editpolicy' > \
+ * # echo 'delete /usr/sbin/tomoyo-editpolicy' > \
  *                                        /sys/kernel/security/tomoyo/manager
  *
  * and all entries are retrieved by
@@ -1071,44 +398,42 @@ LIST_HEAD(tomoyo_policy_manager_list);
 static int tomoyo_update_manager_entry(const char *manager,
                                       const bool is_delete)
 {
-       struct tomoyo_policy_manager_entry *entry = NULL;
        struct tomoyo_policy_manager_entry *ptr;
-       const struct tomoyo_path_info *saved_manager;
+       struct tomoyo_policy_manager_entry e = { };
        int error = is_delete ? -ENOENT : -ENOMEM;
-       bool is_domain = false;
 
        if (tomoyo_is_domain_def(manager)) {
                if (!tomoyo_is_correct_domain(manager))
                        return -EINVAL;
-               is_domain = true;
+               e.is_domain = true;
        } else {
-               if (!tomoyo_is_correct_path(manager, 1, -1, -1))
+               if (!tomoyo_is_correct_path(manager))
                        return -EINVAL;
        }
-       saved_manager = tomoyo_get_name(manager);
-       if (!saved_manager)
+       e.manager = tomoyo_get_name(manager);
+       if (!e.manager)
                return -ENOMEM;
-       if (!is_delete)
-               entry = kmalloc(sizeof(*entry), GFP_KERNEL);
-       mutex_lock(&tomoyo_policy_lock);
+       if (mutex_lock_interruptible(&tomoyo_policy_lock))
+               goto out;
        list_for_each_entry_rcu(ptr, &tomoyo_policy_manager_list, list) {
-               if (ptr->manager != saved_manager)
+               if (ptr->manager != e.manager)
                        continue;
                ptr->is_deleted = is_delete;
                error = 0;
                break;
        }
-       if (!is_delete && error && tomoyo_memory_ok(entry)) {
-               entry->manager = saved_manager;
-               saved_manager = NULL;
-               entry->is_domain = is_domain;
-               list_add_tail_rcu(&entry->list, &tomoyo_policy_manager_list);
-               entry = NULL;
-               error = 0;
+       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);
-       tomoyo_put_name(saved_manager);
-       kfree(entry);
+ out:
+       tomoyo_put_name(e.manager);
        return error;
 }
 
@@ -1231,12 +556,17 @@ static bool tomoyo_is_select_one(struct tomoyo_io_buffer *head,
 {
        unsigned int pid;
        struct tomoyo_domain_info *domain = NULL;
+       bool global_pid = false;
 
-       if (sscanf(data, "pid=%u", &pid) == 1) {
+       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);
@@ -1287,7 +617,8 @@ static int tomoyo_delete_domain(char *domainname)
 
        name.name = domainname;
        tomoyo_fill_path_info(&name);
-       mutex_lock(&tomoyo_policy_lock);
+       if (mutex_lock_interruptible(&tomoyo_policy_lock))
+               return 0;
        /* Is there an active domain? */
        list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
                /* Never delete tomoyo_kernel_domain */
@@ -1303,6 +634,24 @@ static int tomoyo_delete_domain(char *domainname)
        return 0;
 }
 
+/**
+ * tomoyo_write_domain_policy2 - 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_domain_policy2(char *data,
+                                      struct tomoyo_domain_info *domain,
+                                      const bool is_delete)
+{
+       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_ALLOW_MOUNT))
+                return tomoyo_write_mount_policy(data, domain, is_delete);
+       return tomoyo_write_file_policy(data, domain, is_delete);
+}
+
 /**
  * tomoyo_write_domain_policy - Write domain policy.
  *
@@ -1353,7 +702,15 @@ 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_domain_policy2(data, domain, is_delete);
 }
 
 /**
@@ -1369,23 +726,20 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
 {
        int pos;
        u8 bit;
-       const char *atmark = "";
-       const char *filename;
-       const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
+       const u16 perm = ptr->perm;
 
-       filename = ptr->filename->name;
        for (bit = head->read_bit; bit < TOMOYO_MAX_PATH_OPERATION; bit++) {
-               const char *msg;
                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;
-               msg = tomoyo_path2keyword(bit);
                pos = head->read_avail;
-               if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg,
-                                     atmark, filename))
+               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;
@@ -1408,23 +762,88 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
                                   struct tomoyo_path2_acl *ptr)
 {
        int pos;
-       const char *atmark1 = "";
-       const char *atmark2 = "";
-       const char *filename1;
-       const char *filename2;
        const u8 perm = ptr->perm;
        u8 bit;
 
-       filename1 = ptr->filename1->name;
-       filename2 = ptr->filename2->name;
        for (bit = head->read_bit; bit < TOMOYO_MAX_PATH2_OPERATION; bit++) {
-               const char *msg;
                if (!(perm & (1 << bit)))
                        continue;
-               msg = tomoyo_path22keyword(bit);
                pos = head->read_avail;
-               if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg,
-                                     atmark1, filename1, atmark2, filename2))
+               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;
+       }
+       head->read_bit = 0;
+       return true;
+ out:
+       head->read_bit = bit;
+       head->read_avail = pos;
+       return false;
+}
+
+/**
+ * tomoyo_print_path_number_acl - Print a path_number ACL entry.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ * @ptr:  Pointer to "struct tomoyo_path_number_acl".
+ *
+ * Returns true on success, false otherwise.
+ */
+static bool tomoyo_print_path_number_acl(struct tomoyo_io_buffer *head,
+                                        struct tomoyo_path_number_acl *ptr)
+{
+       int pos;
+       u8 bit;
+       const u8 perm = ptr->perm;
+       for (bit = head->read_bit; bit < TOMOYO_MAX_PATH_NUMBER_OPERATION;
+            bit++) {
+               if (!(perm & (1 << bit)))
+                       continue;
+               pos = head->read_avail;
+               if (!tomoyo_io_printf(head, "allow_%s",
+                                     tomoyo_path_number2keyword(bit)) ||
+                   !tomoyo_print_name_union(head, &ptr->name) ||
+                   !tomoyo_print_number_union(head, &ptr->number) ||
+                   !tomoyo_io_printf(head, "\n"))
+                       goto out;
+       }
+       head->read_bit = 0;
+       return true;
+ out:
+       head->read_bit = bit;
+       head->read_avail = pos;
+       return false;
+}
+
+/**
+ * tomoyo_print_path_number3_acl - Print a path_number3 ACL entry.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ * @ptr:  Pointer to "struct tomoyo_path_number3_acl".
+ *
+ * Returns true on success, false otherwise.
+ */
+static bool tomoyo_print_path_number3_acl(struct tomoyo_io_buffer *head,
+                                         struct tomoyo_path_number3_acl *ptr)
+{
+       int pos;
+       u8 bit;
+       const u16 perm = ptr->perm;
+       for (bit = head->read_bit; bit < TOMOYO_MAX_PATH_NUMBER3_OPERATION;
+            bit++) {
+               if (!(perm & (1 << bit)))
+                       continue;
+               pos = head->read_avail;
+               if (!tomoyo_io_printf(head, "allow_%s",
+                                     tomoyo_path_number32keyword(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) ||
+                   !tomoyo_io_printf(head, "\n"))
                        goto out;
        }
        head->read_bit = 0;
@@ -1435,6 +854,32 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
        return false;
 }
 
+/**
+ * tomoyo_print_mount_acl - Print a mount ACL entry.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ * @ptr:  Pointer to "struct tomoyo_mount_acl".
+ *
+ * Returns true on success, false otherwise.
+ */
+static bool tomoyo_print_mount_acl(struct tomoyo_io_buffer *head,
+                                  struct tomoyo_mount_acl *ptr)
+{
+       const int pos = head->read_avail;
+       if (ptr->is_deleted)
+               return true;
+       if (!tomoyo_io_printf(head, TOMOYO_KEYWORD_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) ||
+           !tomoyo_io_printf(head, "\n")) {
+               head->read_avail = pos;
+               return false;
+       }
+       return true;
+}
+
 /**
  * tomoyo_print_entry - Print an ACL entry.
  *
@@ -1458,6 +903,23 @@ static bool tomoyo_print_entry(struct tomoyo_io_buffer *head,
                        = container_of(ptr, struct tomoyo_path2_acl, head);
                return tomoyo_print_path2_acl(head, acl);
        }
+       if (acl_type == TOMOYO_TYPE_PATH_NUMBER_ACL) {
+               struct tomoyo_path_number_acl *acl
+                       = container_of(ptr, struct tomoyo_path_number_acl,
+                                      head);
+               return tomoyo_print_path_number_acl(head, acl);
+       }
+       if (acl_type == TOMOYO_TYPE_PATH_NUMBER3_ACL) {
+               struct tomoyo_path_number3_acl *acl
+                       = container_of(ptr, struct tomoyo_path_number3_acl,
+                                      head);
+               return tomoyo_print_path_number3_acl(head, acl);
+       }
+       if (acl_type == TOMOYO_TYPE_MOUNT_ACL) {
+               struct tomoyo_mount_acl *acl
+                       = container_of(ptr, struct tomoyo_mount_acl, head);
+               return tomoyo_print_mount_acl(head, acl);
+       }
        BUG(); /* This must not happen. */
        return false;
 }
@@ -1546,7 +1008,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().
  */
@@ -1687,6 +1149,10 @@ static int tomoyo_write_exception_policy(struct tomoyo_io_buffer *head)
                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);
+       if (tomoyo_str_starts(&data, TOMOYO_KEYWORD_NUMBER_GROUP))
+               return tomoyo_write_number_group_policy(data, is_delete);
        return -EINVAL;
 }
 
@@ -1743,6 +1209,18 @@ static int tomoyo_read_exception_policy(struct tomoyo_io_buffer *head)
                        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:
+                       if (!tomoyo_read_number_group_policy(head))
+                               break;
+                       head->read_var1 = NULL;
+                       head->read_var2 = NULL;
+                       head->read_step = 11;
+               case 11:
                        head->read_eof = true;
                        break;
                default:
@@ -1752,89 +1230,355 @@ static int tomoyo_read_exception_policy(struct tomoyo_io_buffer *head)
        return 0;
 }
 
-/* path to policy loader */
-static const char *tomoyo_loader = "/sbin/tomoyo-init";
+/**
+ * tomoyo_print_header - Get header line of audit log.
+ *
+ * @r: Pointer to "struct tomoyo_request_info".
+ *
+ * Returns string representation.
+ *
+ * This function uses kmalloc(), so caller must kfree() if this function
+ * didn't return NULL.
+ */
+static char *tomoyo_print_header(struct tomoyo_request_info *r)
+{
+       static const char *tomoyo_mode_4[4] = {
+               "disabled", "learning", "permissive", "enforcing"
+       };
+       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_4[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_policy_loader_exists - Check whether /sbin/tomoyo-init exists.
+ * tomoyo_init_audit_log - Allocate buffer for audit logs.
+ *
+ * @len: Required size.
+ * @r:   Pointer to "struct tomoyo_request_info".
+ *
+ * Returns pointer to allocated memory.
  *
- * Returns true if /sbin/tomoyo-init exists, false otherwise.
+ * 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 bool tomoyo_policy_loader_exists(void)
+static char *tomoyo_init_audit_log(int *len, struct tomoyo_request_info *r)
 {
-       /*
-        * 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;
+       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 (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;
+/* 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_entry {
+       struct list_head list;
+       char *query;
+       int query_len;
+       unsigned int serial;
+       int timer;
+       int answer;
+};
+
+/* The list for "struct tomoyo_query_entry". */
+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 *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_domain_policy2(buffer, r->domain, false);
+               kfree(buffer);
+               /* fall through */
+       case TOMOYO_CONFIG_PERMISSIVE:
+               return 0;
        }
-       path_put(&path);
-       return true;
+       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;
+       tomoyo_query_entry = kzalloc(sizeof(*tomoyo_query_entry), GFP_NOFS);
+       if (!tomoyo_query_entry)
+               goto out;
+       tomoyo_query_entry->query = kzalloc(len, GFP_NOFS);
+       if (!tomoyo_query_entry->query)
+               goto out;
+       len = ksize(tomoyo_query_entry->query);
+       INIT_LIST_HEAD(&tomoyo_query_entry->list);
+       spin_lock(&tomoyo_query_list_lock);
+       if (tomoyo_quota_for_query && tomoyo_query_memory_size + len +
+           sizeof(*tomoyo_query_entry) >= tomoyo_quota_for_query) {
+               quota_exceeded = true;
+       } else {
+               tomoyo_query_memory_size += len + sizeof(*tomoyo_query_entry);
+               tomoyo_query_entry->serial = tomoyo_serial++;
+       }
+       spin_unlock(&tomoyo_query_list_lock);
+       if (quota_exceeded)
+               goto out;
+       pos = snprintf(tomoyo_query_entry->query, len - 1, "Q%u-%hu\n%s",
+                      tomoyo_query_entry->serial, r->retry, header);
+       kfree(header);
+       header = NULL;
+       va_start(args, fmt);
+       vsnprintf(tomoyo_query_entry->query + pos, len - 1 - pos, fmt, args);
+       tomoyo_query_entry->query_len = strlen(tomoyo_query_entry->query) + 1;
+       va_end(args);
+       spin_lock(&tomoyo_query_list_lock);
+       list_add_tail(&tomoyo_query_entry->list, &tomoyo_query_list);
+       spin_unlock(&tomoyo_query_list_lock);
+       /* Give 10 seconds for supervisor's opinion. */
+       for (tomoyo_query_entry->timer = 0;
+            atomic_read(&tomoyo_query_observers) && tomoyo_query_entry->timer < 100;
+            tomoyo_query_entry->timer++) {
+               wake_up(&tomoyo_query_wait);
+               set_current_state(TASK_INTERRUPTIBLE);
+               schedule_timeout(HZ / 10);
+               if (tomoyo_query_entry->answer)
+                       break;
+       }
+       spin_lock(&tomoyo_query_list_lock);
+       list_del(&tomoyo_query_entry->list);
+       tomoyo_query_memory_size -= len + sizeof(*tomoyo_query_entry);
+       spin_unlock(&tomoyo_query_list_lock);
+       switch (tomoyo_query_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 (tomoyo_query_entry)
+               kfree(tomoyo_query_entry->query);
+       kfree(tomoyo_query_entry);
+       kfree(header);
+       return error;
 }
 
 /**
- * tomoyo_load_policy - Run external policy loader to load policy.
+ * tomoyo_poll_query - poll() for /sys/kernel/security/tomoyo/query.
  *
- * @filename: The program about to start.
+ * @file: Pointer to "struct file".
+ * @wait: Pointer to "poll_table".
  *
- * 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.
+ * Returns POLLIN | POLLRDNORM when ready to read, 0 otherwise.
  *
- * Returns nothing.
+ * Waits for access requests which violated policy in enforcing mode.
  */
-void tomoyo_load_policy(const char *filename)
+static int tomoyo_poll_query(struct file *file, poll_table *wait)
 {
-       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])
+       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_entry *ptr
+                               = list_entry(tmp, struct tomoyo_query_entry,
+                                            list);
+                       if (ptr->answer)
                                continue;
-                       panic("Profile %u (used by '%s') not defined.\n",
-                             profile, domain->domainname->name);
+                       found = true;
+                       break;
                }
+               spin_unlock(&tomoyo_query_list_lock);
+               if (found)
+                       return POLLIN | POLLRDNORM;
+               if (i)
+                       break;
+               poll_wait(file, &tomoyo_query_wait, wait);
+       }
+       return 0;
+}
+
+/**
+ * tomoyo_read_query - Read access requests which violated policy in enforcing mode.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ *
+ * Returns 0.
+ */
+static int tomoyo_read_query(struct tomoyo_io_buffer *head)
+{
+       struct list_head *tmp;
+       int pos = 0;
+       int len = 0;
+       char *buf;
+       if (head->read_avail)
+               return 0;
+       if (head->read_buf) {
+               kfree(head->read_buf);
+               head->read_buf = NULL;
+               head->readbuf_size = 0;
+       }
+       spin_lock(&tomoyo_query_list_lock);
+       list_for_each(tmp, &tomoyo_query_list) {
+               struct tomoyo_query_entry *ptr
+                       = list_entry(tmp, struct tomoyo_query_entry, list);
+               if (ptr->answer)
+                       continue;
+               if (pos++ != head->read_step)
+                       continue;
+               len = ptr->query_len;
+               break;
+       }
+       spin_unlock(&tomoyo_query_list_lock);
+       if (!len) {
+               head->read_step = 0;
+               return 0;
+       }
+       buf = kzalloc(len, GFP_NOFS);
+       if (!buf)
+               return 0;
+       pos = 0;
+       spin_lock(&tomoyo_query_list_lock);
+       list_for_each(tmp, &tomoyo_query_list) {
+               struct tomoyo_query_entry *ptr
+                       = list_entry(tmp, struct tomoyo_query_entry, list);
+               if (ptr->answer)
+                       continue;
+               if (pos++ != head->read_step)
+                       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_avail = len;
+               head->readbuf_size = head->read_avail;
+               head->read_buf = buf;
+               head->read_step++;
+       } else {
+               kfree(buf);
+       }
+       return 0;
+}
+
+/**
+ * tomoyo_write_answer - Write the supervisor's decision.
+ *
+ * @head: Pointer to "struct tomoyo_io_buffer".
+ *
+ * Returns 0 on success, -EINVAL otherwise.
+ */
+static int tomoyo_write_answer(struct tomoyo_io_buffer *head)
+{
+       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_entry *ptr
+                       = list_entry(tmp, struct tomoyo_query_entry, 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_entry *ptr
+                       = list_entry(tmp, struct tomoyo_query_entry, list);
+               if (ptr->serial != serial)
+                       continue;
+               if (!ptr->answer)
+                       ptr->answer = answer;
+               break;
+       }
+       spin_unlock(&tomoyo_query_list_lock);
+       return 0;
 }
 
 /**
@@ -1884,13 +1628,14 @@ 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_KERNEL);
+       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 */
@@ -1932,6 +1677,11 @@ 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;
@@ -1944,10 +1694,12 @@ 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_KERNEL);
+               head->read_buf = kzalloc(head->readbuf_size, GFP_NOFS);
                if (!head->read_buf) {
                        kfree(head);
                        return -ENOMEM;
@@ -1961,14 +1713,15 @@ static int tomoyo_open_control(const u8 type, struct file *file)
                head->write = NULL;
        } else if (head->write) {
                head->writebuf_size = 4096 * 2;
-               head->write_buf = kzalloc(head->writebuf_size, GFP_KERNEL);
+               head->write_buf = kzalloc(head->writebuf_size, GFP_NOFS);
                if (!head->write_buf) {
                        kfree(head->read_buf);
                        kfree(head);
                        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
@@ -1979,9 +1732,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.
  *
@@ -1993,8 +1771,8 @@ 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;
        struct tomoyo_io_buffer *head = file->private_data;
@@ -2038,8 +1816,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;
@@ -2090,12 +1868,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;
@@ -2110,129 +1895,22 @@ 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);
+       printk(KERN_INFO "TOMOYO: 2.2.0   2009/04/01\n");
+       printk(KERN_INFO "Mandatory Access Control activated.\n");
 }
-
-fs_initcall(tomoyo_initerface_init);
This page took 0.043917 seconds and 5 git commands to generate.