Patched in Tegra support.

1 files changed, 14 insertions, 81 deletions

diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c
index 2952ba576fb..c36bd1107fc 100644
--- a/security/tomoyo/util.c
+++ b/security/tomoyo/util.c
@@ -42,39 +42,6 @@ const u8 tomoyo_index2category[TOMOYO_MAX_MAC_INDEX] = {
         [TOMOYO_MAC_FILE_MOUNT]      = TOMOYO_MAC_CATEGORY_FILE,
         [TOMOYO_MAC_FILE_UMOUNT]     = TOMOYO_MAC_CATEGORY_FILE,
         [TOMOYO_MAC_FILE_PIVOT_ROOT] = TOMOYO_MAC_CATEGORY_FILE,
-        /* CONFIG::network group */
-        [TOMOYO_MAC_NETWORK_INET_STREAM_BIND]       =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_INET_STREAM_LISTEN]     =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_INET_STREAM_CONNECT]    =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_INET_DGRAM_BIND]        =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_INET_DGRAM_SEND]        =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_INET_RAW_BIND]          =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_INET_RAW_SEND]          =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_STREAM_BIND]       =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_STREAM_LISTEN]     =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_STREAM_CONNECT]    =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_DGRAM_BIND]        =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_DGRAM_SEND]        =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_SEQPACKET_BIND]    =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_SEQPACKET_LISTEN]  =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        [TOMOYO_MAC_NETWORK_UNIX_SEQPACKET_CONNECT] =
-        TOMOYO_MAC_CATEGORY_NETWORK,
-        /* CONFIG::misc group */
-        [TOMOYO_MAC_ENVIRON]         = TOMOYO_MAC_CATEGORY_MISC,
 };
 
 /**
@@ -159,31 +126,6 @@ char *tomoyo_read_token(struct tomoyo_acl_param *param)
 }
 
 /**
- * tomoyo_get_domainname - Read a domainname from a line.
- *
- * @param: Pointer to "struct tomoyo_acl_param".
- *
- * Returns a domainname on success, NULL otherwise.
- */
-const struct tomoyo_path_info *tomoyo_get_domainname
-(struct tomoyo_acl_param *param)
-{
-        char *start = param->data;
-        char *pos = start;
-        while (*pos) {
-                if (*pos++ != ' ' || *pos++ == '/')
-                        continue;
-                pos -= 2;
-                *pos++ = '\0';
-                break;
-        }
-        param->data = pos;
-        if (tomoyo_correct_domain(start))
-                return tomoyo_get_name(start);
-        return NULL;
-}
-
-/**
  * tomoyo_parse_ulong - Parse an "unsigned long" value.
  *
  * @result: Pointer to "unsigned long".
@@ -492,13 +434,13 @@ static bool tomoyo_correct_word2(const char *string, size_t len)
                                 if (d < '0' || d > '7' || e < '0' || e > '7')
                                         break;
                                 c = tomoyo_make_byte(c, d, e);
-                                if (c <= ' ' || c >= 127)
-                                        continue;
+                                if (tomoyo_invalid(c))
+                                        continue; /* pattern is not \000 */
                         }
                         goto out;
                 } else if (in_repetition && c == '/') {
                         goto out;
-                } else if (c <= ' ' || c >= 127) {
+                } else if (tomoyo_invalid(c)) {
                         goto out;
                 }
         }
@@ -949,13 +891,18 @@ bool tomoyo_path_matches_pattern(const struct tomoyo_path_info *filename,
 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);
-        if (mm->exe_file)
-                cp = tomoyo_realpath_from_path(&mm->exe_file->f_path);
+        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;
 }
@@ -973,17 +920,14 @@ int tomoyo_get_mode(const struct tomoyo_policy_namespace *ns, const u8 profile,
                     const u8 index)
 {
         u8 mode;
-        struct tomoyo_profile *p;
-
+        const u8 category = TOMOYO_MAC_CATEGORY_FILE;
         if (!tomoyo_policy_loaded)
                 return TOMOYO_CONFIG_DISABLED;
-        p = tomoyo_profile(ns, profile);
-        mode = p->config[index];
+        mode = tomoyo_profile(ns, profile)->config[index];
         if (mode == TOMOYO_CONFIG_USE_DEFAULT)
-                mode = p->config[tomoyo_index2category[index]
-                                 + TOMOYO_MAX_MAC_INDEX];
+                mode = tomoyo_profile(ns, profile)->config[category];
         if (mode == TOMOYO_CONFIG_USE_DEFAULT)
-                mode = p->default_config;
+                mode = tomoyo_profile(ns, profile)->default_config;
         return mode & 3;
 }
 
@@ -1052,17 +996,6 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r)
                         perm = container_of(ptr, struct tomoyo_mkdev_acl,
                                             head)->perm;
                         break;
-                case TOMOYO_TYPE_INET_ACL:
-                        perm = container_of(ptr, struct tomoyo_inet_acl,
-                                            head)->perm;
-                        break;
-                case TOMOYO_TYPE_UNIX_ACL:
-                        perm = container_of(ptr, struct tomoyo_unix_acl,
-                                            head)->perm;
-                        break;
-                case TOMOYO_TYPE_MANUAL_TASK_ACL:
-                        perm = 0;
-                        break;
                 default:
                         perm = 1;
                 }