]> Pileus Git - ~andy/linux/blobdiff - security/tomoyo/file.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[~andy/linux] / security / tomoyo / file.c
index 4259e0a136d80b226dc5d830403abd806d7d09b9..743c35f5084a1125c63e04043bdfb71bb8128651 100644 (file)
@@ -1,54 +1,12 @@
 /*
  * security/tomoyo/file.c
  *
- * Pathname restriction functions.
- *
- * Copyright (C) 2005-2010  NTT DATA CORPORATION
+ * Copyright (C) 2005-2011  NTT DATA CORPORATION
  */
 
 #include "common.h"
 #include <linux/slab.h>
 
-/* Keyword array for operations with one pathname. */
-const char *tomoyo_path_keyword[TOMOYO_MAX_PATH_OPERATION] = {
-       [TOMOYO_TYPE_EXECUTE]    = "execute",
-       [TOMOYO_TYPE_READ]       = "read",
-       [TOMOYO_TYPE_WRITE]      = "write",
-       [TOMOYO_TYPE_APPEND]     = "append",
-       [TOMOYO_TYPE_UNLINK]     = "unlink",
-       [TOMOYO_TYPE_GETATTR]    = "getattr",
-       [TOMOYO_TYPE_RMDIR]      = "rmdir",
-       [TOMOYO_TYPE_TRUNCATE]   = "truncate",
-       [TOMOYO_TYPE_SYMLINK]    = "symlink",
-       [TOMOYO_TYPE_CHROOT]     = "chroot",
-       [TOMOYO_TYPE_UMOUNT]     = "unmount",
-};
-
-/* Keyword array for operations with one pathname and three numbers. */
-const char *tomoyo_mkdev_keyword[TOMOYO_MAX_MKDEV_OPERATION] = {
-       [TOMOYO_TYPE_MKBLOCK]    = "mkblock",
-       [TOMOYO_TYPE_MKCHAR]     = "mkchar",
-};
-
-/* Keyword array for operations with two pathnames. */
-const char *tomoyo_path2_keyword[TOMOYO_MAX_PATH2_OPERATION] = {
-       [TOMOYO_TYPE_LINK]       = "link",
-       [TOMOYO_TYPE_RENAME]     = "rename",
-       [TOMOYO_TYPE_PIVOT_ROOT] = "pivot_root",
-};
-
-/* Keyword array for operations with one pathname and one number. */
-const char *tomoyo_path_number_keyword[TOMOYO_MAX_PATH_NUMBER_OPERATION] = {
-       [TOMOYO_TYPE_CREATE]     = "create",
-       [TOMOYO_TYPE_MKDIR]      = "mkdir",
-       [TOMOYO_TYPE_MKFIFO]     = "mkfifo",
-       [TOMOYO_TYPE_MKSOCK]     = "mksock",
-       [TOMOYO_TYPE_IOCTL]      = "ioctl",
-       [TOMOYO_TYPE_CHMOD]      = "chmod",
-       [TOMOYO_TYPE_CHOWN]      = "chown",
-       [TOMOYO_TYPE_CHGRP]      = "chgrp",
-};
-
 /*
  * Mapping table from "enum tomoyo_path_acl_index" to "enum tomoyo_mac_index".
  */
@@ -69,7 +27,7 @@ static const u8 tomoyo_p2mac[TOMOYO_MAX_PATH_OPERATION] = {
 /*
  * Mapping table from "enum tomoyo_mkdev_acl_index" to "enum tomoyo_mac_index".
  */
-static const u8 tomoyo_pnnn2mac[TOMOYO_MAX_MKDEV_OPERATION] = {
+const u8 tomoyo_pnnn2mac[TOMOYO_MAX_MKDEV_OPERATION] = {
        [TOMOYO_TYPE_MKBLOCK] = TOMOYO_MAC_FILE_MKBLOCK,
        [TOMOYO_TYPE_MKCHAR]  = TOMOYO_MAC_FILE_MKCHAR,
 };
@@ -77,7 +35,7 @@ static const u8 tomoyo_pnnn2mac[TOMOYO_MAX_MKDEV_OPERATION] = {
 /*
  * Mapping table from "enum tomoyo_path2_acl_index" to "enum tomoyo_mac_index".
  */
-static const u8 tomoyo_pp2mac[TOMOYO_MAX_PATH2_OPERATION] = {
+const u8 tomoyo_pp2mac[TOMOYO_MAX_PATH2_OPERATION] = {
        [TOMOYO_TYPE_LINK]       = TOMOYO_MAC_FILE_LINK,
        [TOMOYO_TYPE_RENAME]     = TOMOYO_MAC_FILE_RENAME,
        [TOMOYO_TYPE_PIVOT_ROOT] = TOMOYO_MAC_FILE_PIVOT_ROOT,
@@ -87,7 +45,7 @@ static const u8 tomoyo_pp2mac[TOMOYO_MAX_PATH2_OPERATION] = {
  * Mapping table from "enum tomoyo_path_number_acl_index" to
  * "enum tomoyo_mac_index".
  */
-static const u8 tomoyo_pn2mac[TOMOYO_MAX_PATH_NUMBER_OPERATION] = {
+const u8 tomoyo_pn2mac[TOMOYO_MAX_PATH_NUMBER_OPERATION] = {
        [TOMOYO_TYPE_CREATE] = TOMOYO_MAC_FILE_CREATE,
        [TOMOYO_TYPE_MKDIR]  = TOMOYO_MAC_FILE_MKDIR,
        [TOMOYO_TYPE_MKFIFO] = TOMOYO_MAC_FILE_MKFIFO,
@@ -194,7 +152,7 @@ static bool tomoyo_get_realpath(struct tomoyo_path_info *buf, struct path *path)
                tomoyo_fill_path_info(buf);
                return true;
        }
-        return false;
+       return false;
 }
 
 /**
@@ -206,13 +164,9 @@ static bool tomoyo_get_realpath(struct tomoyo_path_info *buf, struct path *path)
  */
 static int tomoyo_audit_path_log(struct tomoyo_request_info *r)
 {
-       const char *operation = tomoyo_path_keyword[r->param.path.operation];
-       const struct tomoyo_path_info *filename = r->param.path.filename;
-       if (r->granted)
-               return 0;
-       tomoyo_warn_log(r, "%s %s", operation, filename->name);
-       return tomoyo_supervisor(r, "allow_%s %s\n", operation,
-                                filename->name);
+       return tomoyo_supervisor(r, "file %s %s\n", tomoyo_path_keyword
+                                [r->param.path.operation],
+                                r->param.path.filename->name);
 }
 
 /**
@@ -224,15 +178,10 @@ static int tomoyo_audit_path_log(struct tomoyo_request_info *r)
  */
 static int tomoyo_audit_path2_log(struct tomoyo_request_info *r)
 {
-       const char *operation = tomoyo_path2_keyword[r->param.path2.operation];
-       const struct tomoyo_path_info *filename1 = r->param.path2.filename1;
-       const struct tomoyo_path_info *filename2 = r->param.path2.filename2;
-       if (r->granted)
-               return 0;
-       tomoyo_warn_log(r, "%s %s %s", operation, filename1->name,
-                       filename2->name);
-       return tomoyo_supervisor(r, "allow_%s %s %s\n", operation,
-                                filename1->name, filename2->name);
+       return tomoyo_supervisor(r, "file %s %s %s\n", tomoyo_mac_keywords
+                                [tomoyo_pp2mac[r->param.path2.operation]],
+                                r->param.path2.filename1->name,
+                                r->param.path2.filename2->name);
 }
 
 /**
@@ -244,17 +193,12 @@ static int tomoyo_audit_path2_log(struct tomoyo_request_info *r)
  */
 static int tomoyo_audit_mkdev_log(struct tomoyo_request_info *r)
 {
-       const char *operation = tomoyo_mkdev_keyword[r->param.mkdev.operation];
-       const struct tomoyo_path_info *filename = r->param.mkdev.filename;
-       const unsigned int major = r->param.mkdev.major;
-       const unsigned int minor = r->param.mkdev.minor;
-       const unsigned int mode = r->param.mkdev.mode;
-       if (r->granted)
-               return 0;
-       tomoyo_warn_log(r, "%s %s 0%o %u %u", operation, filename->name, mode,
-                       major, minor);
-       return tomoyo_supervisor(r, "allow_%s %s 0%o %u %u\n", operation,
-                                filename->name, mode, major, minor);
+       return tomoyo_supervisor(r, "file %s %s 0%o %u %u\n",
+                                tomoyo_mac_keywords
+                                [tomoyo_pnnn2mac[r->param.mkdev.operation]],
+                                r->param.mkdev.filename->name,
+                                r->param.mkdev.mode, r->param.mkdev.major,
+                                r->param.mkdev.minor);
 }
 
 /**
@@ -268,11 +212,7 @@ static int tomoyo_audit_path_number_log(struct tomoyo_request_info *r)
 {
        const u8 type = r->param.path_number.operation;
        u8 radix;
-       const struct tomoyo_path_info *filename = r->param.path_number.filename;
-       const char *operation = tomoyo_path_number_keyword[type];
        char buffer[64];
-       if (r->granted)
-               return 0;
        switch (type) {
        case TOMOYO_TYPE_CREATE:
        case TOMOYO_TYPE_MKDIR:
@@ -290,9 +230,9 @@ static int tomoyo_audit_path_number_log(struct tomoyo_request_info *r)
        }
        tomoyo_print_ulong(buffer, sizeof(buffer), r->param.path_number.number,
                           radix);
-       tomoyo_warn_log(r, "%s %s %s", operation, filename->name, buffer);
-       return tomoyo_supervisor(r, "allow_%s %s %s\n", operation,
-                                filename->name, buffer);
+       return tomoyo_supervisor(r, "file %s %s %s\n", tomoyo_mac_keywords
+                                [tomoyo_pn2mac[type]],
+                                r->param.path_number.filename->name, buffer);
 }
 
 /**
@@ -428,29 +368,27 @@ static bool tomoyo_merge_path_acl(struct tomoyo_acl_info *a,
 /**
  * tomoyo_update_path_acl - Update "struct tomoyo_path_acl" list.
  *
- * @type:      Type of operation.
- * @filename:  Filename.
- * @domain:    Pointer to "struct tomoyo_domain_info".
- * @is_delete: True if it is a delete request.
+ * @perm:  Permission.
+ * @param: Pointer to "struct tomoyo_acl_param".
  *
  * Returns 0 on success, negative value otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_update_path_acl(const u8 type, const char *filename,
-                                 struct tomoyo_domain_info * const domain,
-                                 const bool is_delete)
+static int tomoyo_update_path_acl(const u16 perm,
+                                 struct tomoyo_acl_param *param)
 {
        struct tomoyo_path_acl e = {
                .head.type = TOMOYO_TYPE_PATH_ACL,
-               .perm = 1 << type
+               .perm = perm
        };
        int error;
-       if (!tomoyo_parse_name_union(filename, &e.name))
-               return -EINVAL;
-       error = tomoyo_update_domain(&e.head, sizeof(e), is_delete, domain,
-                                    tomoyo_same_path_acl,
-                                    tomoyo_merge_path_acl);
+       if (!tomoyo_parse_name_union(param, &e.name))
+               error = -EINVAL;
+       else
+               error = tomoyo_update_domain(&e.head, sizeof(e), param,
+                                            tomoyo_same_path_acl,
+                                            tomoyo_merge_path_acl);
        tomoyo_put_name_union(&e.name);
        return error;
 }
@@ -503,37 +441,30 @@ static bool tomoyo_merge_mkdev_acl(struct tomoyo_acl_info *a,
 /**
  * tomoyo_update_mkdev_acl - Update "struct tomoyo_mkdev_acl" list.
  *
- * @type:      Type of operation.
- * @filename:  Filename.
- * @mode:      Create mode.
- * @major:     Device major number.
- * @minor:     Device minor number.
- * @domain:    Pointer to "struct tomoyo_domain_info".
- * @is_delete: True if it is a delete request.
+ * @perm:  Permission.
+ * @param: Pointer to "struct tomoyo_acl_param".
  *
  * Returns 0 on success, negative value otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_update_mkdev_acl(const u8 type, const char *filename,
-                                  char *mode, char *major, char *minor,
-                                  struct tomoyo_domain_info * const domain,
-                                  const bool is_delete)
+static int tomoyo_update_mkdev_acl(const u8 perm,
+                                  struct tomoyo_acl_param *param)
 {
        struct tomoyo_mkdev_acl e = {
                .head.type = TOMOYO_TYPE_MKDEV_ACL,
-               .perm = 1 << type
+               .perm = perm
        };
-       int error = is_delete ? -ENOENT : -ENOMEM;
-       if (!tomoyo_parse_name_union(filename, &e.name) ||
-           !tomoyo_parse_number_union(mode, &e.mode) ||
-           !tomoyo_parse_number_union(major, &e.major) ||
-           !tomoyo_parse_number_union(minor, &e.minor))
-               goto out;
-       error = tomoyo_update_domain(&e.head, sizeof(e), is_delete, domain,
-                                    tomoyo_same_mkdev_acl,
-                                    tomoyo_merge_mkdev_acl);
- out:
+       int error;
+       if (!tomoyo_parse_name_union(param, &e.name) ||
+           !tomoyo_parse_number_union(param, &e.mode) ||
+           !tomoyo_parse_number_union(param, &e.major) ||
+           !tomoyo_parse_number_union(param, &e.minor))
+               error = -EINVAL;
+       else
+               error = tomoyo_update_domain(&e.head, sizeof(e), param,
+                                            tomoyo_same_mkdev_acl,
+                                            tomoyo_merge_mkdev_acl);
        tomoyo_put_name_union(&e.name);
        tomoyo_put_number_union(&e.mode);
        tomoyo_put_number_union(&e.major);
@@ -586,33 +517,28 @@ static bool tomoyo_merge_path2_acl(struct tomoyo_acl_info *a,
 /**
  * tomoyo_update_path2_acl - Update "struct tomoyo_path2_acl" list.
  *
- * @type:      Type of operation.
- * @filename1: First filename.
- * @filename2: Second filename.
- * @domain:    Pointer to "struct tomoyo_domain_info".
- * @is_delete: True if it is a delete request.
+ * @perm:  Permission.
+ * @param: Pointer to "struct tomoyo_acl_param".
  *
  * Returns 0 on success, negative value otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-static int tomoyo_update_path2_acl(const u8 type, const char *filename1,
-                                  const char *filename2,
-                                  struct tomoyo_domain_info * const domain,
-                                  const bool is_delete)
+static int tomoyo_update_path2_acl(const u8 perm,
+                                  struct tomoyo_acl_param *param)
 {
        struct tomoyo_path2_acl e = {
                .head.type = TOMOYO_TYPE_PATH2_ACL,
-               .perm = 1 << type
+               .perm = perm
        };
-       int error = is_delete ? -ENOENT : -ENOMEM;
-       if (!tomoyo_parse_name_union(filename1, &e.name1) ||
-           !tomoyo_parse_name_union(filename2, &e.name2))
-               goto out;
-       error = tomoyo_update_domain(&e.head, sizeof(e), is_delete, domain,
-                                    tomoyo_same_path2_acl,
-                                    tomoyo_merge_path2_acl);
- out:
+       int error;
+       if (!tomoyo_parse_name_union(param, &e.name1) ||
+           !tomoyo_parse_name_union(param, &e.name2))
+               error = -EINVAL;
+       else
+               error = tomoyo_update_domain(&e.head, sizeof(e), param,
+                                            tomoyo_same_path2_acl,
+                                            tomoyo_merge_path2_acl);
        tomoyo_put_name_union(&e.name1);
        tomoyo_put_name_union(&e.name2);
        return error;
@@ -635,7 +561,7 @@ int tomoyo_path_permission(struct tomoyo_request_info *r, u8 operation,
        int error;
 
        r->type = tomoyo_p2mac[operation];
-       r->mode = tomoyo_get_mode(r->profile, r->type);
+       r->mode = tomoyo_get_mode(r->domain->ns, r->profile, r->type);
        if (r->mode == TOMOYO_CONFIG_DISABLED)
                return 0;
        r->param_type = TOMOYO_TYPE_PATH_ACL;
@@ -701,32 +627,26 @@ static bool tomoyo_merge_path_number_acl(struct tomoyo_acl_info *a,
 /**
  * tomoyo_update_path_number_acl - Update ioctl/chmod/chown/chgrp ACL.
  *
- * @type:      Type of operation.
- * @filename:  Filename.
- * @number:    Number.
- * @domain:    Pointer to "struct tomoyo_domain_info".
- * @is_delete: True if it is a delete request.
+ * @perm:  Permission.
+ * @param: Pointer to "struct tomoyo_acl_param".
  *
  * Returns 0 on success, negative value otherwise.
  */
-static int tomoyo_update_path_number_acl(const u8 type, const char *filename,
-                                        char *number,
-                                        struct tomoyo_domain_info * const
-                                        domain, const bool is_delete)
+static int tomoyo_update_path_number_acl(const u8 perm,
+                                        struct tomoyo_acl_param *param)
 {
        struct tomoyo_path_number_acl e = {
                .head.type = TOMOYO_TYPE_PATH_NUMBER_ACL,
-               .perm = 1 << type
+               .perm = perm
        };
-       int error = is_delete ? -ENOENT : -ENOMEM;
-       if (!tomoyo_parse_name_union(filename, &e.name))
-               return -EINVAL;
-       if (!tomoyo_parse_number_union(number, &e.number))
-               goto out;
-       error = tomoyo_update_domain(&e.head, sizeof(e), is_delete, domain,
-                                    tomoyo_same_path_number_acl,
-                                    tomoyo_merge_path_number_acl);
- out:
+       int error;
+       if (!tomoyo_parse_name_union(param, &e.name) ||
+           !tomoyo_parse_number_union(param, &e.number))
+               error = -EINVAL;
+       else
+               error = tomoyo_update_domain(&e.head, sizeof(e), param,
+                                            tomoyo_same_path_number_acl,
+                                            tomoyo_merge_path_number_acl);
        tomoyo_put_name_union(&e.name);
        tomoyo_put_number_union(&e.number);
        return error;
@@ -745,16 +665,20 @@ int tomoyo_path_number_perm(const u8 type, struct path *path,
                            unsigned long number)
 {
        struct tomoyo_request_info r;
+       struct tomoyo_obj_info obj = {
+               .path1 = *path,
+       };
        int error = -ENOMEM;
        struct tomoyo_path_info buf;
        int idx;
 
        if (tomoyo_init_request_info(&r, NULL, tomoyo_pn2mac[type])
-           == TOMOYO_CONFIG_DISABLED || !path->mnt || !path->dentry)
+           == TOMOYO_CONFIG_DISABLED || !path->dentry)
                return 0;
        idx = tomoyo_read_lock();
        if (!tomoyo_get_realpath(&buf, path))
                goto out;
+       r.obj = &obj;
        if (type == TOMOYO_TYPE_MKDIR)
                tomoyo_add_slash(&buf);
        r.param_type = TOMOYO_TYPE_PATH_NUMBER_ACL;
@@ -789,10 +713,11 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
        int error = 0;
        struct tomoyo_path_info buf;
        struct tomoyo_request_info r;
+       struct tomoyo_obj_info obj = {
+               .path1 = *path,
+       };
        int idx;
 
-       if (!path->mnt)
-               return 0;
        buf.name = NULL;
        r.mode = TOMOYO_CONFIG_DISABLED;
        idx = tomoyo_read_lock();
@@ -803,6 +728,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
                        error = -ENOMEM;
                        goto out;
                }
+               r.obj = &obj;
                if (acc_mode & MAY_READ)
                        error = tomoyo_path_permission(&r, TOMOYO_TYPE_READ,
                                                       &buf);
@@ -825,19 +751,23 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
  *
  * @operation: Type of operation.
  * @path:      Pointer to "struct path".
+ * @target:    Symlink's target if @operation is TOMOYO_TYPE_SYMLINK,
+ *             NULL otherwise.
  *
  * Returns 0 on success, negative value otherwise.
  */
-int tomoyo_path_perm(const u8 operation, struct path *path)
+int tomoyo_path_perm(const u8 operation, struct path *path, const char *target)
 {
        struct tomoyo_request_info r;
+       struct tomoyo_obj_info obj = {
+               .path1 = *path,
+       };
        int error;
        struct tomoyo_path_info buf;
        bool is_enforce;
+       struct tomoyo_path_info symlink_target;
        int idx;
 
-       if (!path->mnt)
-               return 0;
        if (tomoyo_init_request_info(&r, NULL, tomoyo_p2mac[operation])
            == TOMOYO_CONFIG_DISABLED)
                return 0;
@@ -847,13 +777,23 @@ int tomoyo_path_perm(const u8 operation, struct path *path)
        idx = tomoyo_read_lock();
        if (!tomoyo_get_realpath(&buf, path))
                goto out;
+       r.obj = &obj;
        switch (operation) {
        case TOMOYO_TYPE_RMDIR:
        case TOMOYO_TYPE_CHROOT:
                tomoyo_add_slash(&buf);
                break;
+       case TOMOYO_TYPE_SYMLINK:
+               symlink_target.name = tomoyo_encode(target);
+               if (!symlink_target.name)
+                       goto out;
+               tomoyo_fill_path_info(&symlink_target);
+               obj.symlink_target = &symlink_target;
+               break;
        }
        error = tomoyo_path_permission(&r, operation, &buf);
+       if (operation == TOMOYO_TYPE_SYMLINK)
+               kfree(symlink_target.name);
  out:
        kfree(buf.name);
        tomoyo_read_unlock(idx);
@@ -876,17 +816,20 @@ int tomoyo_mkdev_perm(const u8 operation, struct path *path,
                      const unsigned int mode, unsigned int dev)
 {
        struct tomoyo_request_info r;
+       struct tomoyo_obj_info obj = {
+               .path1 = *path,
+       };
        int error = -ENOMEM;
        struct tomoyo_path_info buf;
        int idx;
 
-       if (!path->mnt ||
-           tomoyo_init_request_info(&r, NULL, tomoyo_pnnn2mac[operation])
+       if (tomoyo_init_request_info(&r, NULL, tomoyo_pnnn2mac[operation])
            == TOMOYO_CONFIG_DISABLED)
                return 0;
        idx = tomoyo_read_lock();
        error = -ENOMEM;
        if (tomoyo_get_realpath(&buf, path)) {
+               r.obj = &obj;
                dev = new_decode_dev(dev);
                r.param_type = TOMOYO_TYPE_MKDEV_ACL;
                r.param.mkdev.filename = &buf;
@@ -920,10 +863,13 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
        struct tomoyo_path_info buf1;
        struct tomoyo_path_info buf2;
        struct tomoyo_request_info r;
+       struct tomoyo_obj_info obj = {
+               .path1 = *path1,
+               .path2 = *path2,
+       };
        int idx;
 
-       if (!path1->mnt || !path2->mnt ||
-           tomoyo_init_request_info(&r, NULL, tomoyo_pp2mac[operation])
+       if (tomoyo_init_request_info(&r, NULL, tomoyo_pp2mac[operation])
            == TOMOYO_CONFIG_DISABLED)
                return 0;
        buf1.name = NULL;
@@ -935,16 +881,17 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
        switch (operation) {
                struct dentry *dentry;
        case TOMOYO_TYPE_RENAME:
-        case TOMOYO_TYPE_LINK:
+       case TOMOYO_TYPE_LINK:
                dentry = path1->dentry;
-               if (!dentry->d_inode || !S_ISDIR(dentry->d_inode->i_mode))
-                        break;
-                /* fall through */
-        case TOMOYO_TYPE_PIVOT_ROOT:
-                tomoyo_add_slash(&buf1);
-                tomoyo_add_slash(&buf2);
+               if (!dentry->d_inode || !S_ISDIR(dentry->d_inode->i_mode))
+                       break;
+               /* fall through */
+       case TOMOYO_TYPE_PIVOT_ROOT:
+               tomoyo_add_slash(&buf1);
+               tomoyo_add_slash(&buf2);
                break;
-        }
+       }
+       r.obj = &obj;
        r.param_type = TOMOYO_TYPE_PATH2_ACL;
        r.param.path2.operation = operation;
        r.param.path2.filename1 = &buf1;
@@ -962,54 +909,92 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
        return error;
 }
 
+/**
+ * tomoyo_same_mount_acl - Check for duplicated "struct tomoyo_mount_acl" entry.
+ *
+ * @a: Pointer to "struct tomoyo_acl_info".
+ * @b: Pointer to "struct tomoyo_acl_info".
+ *
+ * Returns true if @a == @b, false otherwise.
+ */
+static bool tomoyo_same_mount_acl(const struct tomoyo_acl_info *a,
+                                 const struct tomoyo_acl_info *b)
+{
+       const struct tomoyo_mount_acl *p1 = container_of(a, typeof(*p1), head);
+       const struct tomoyo_mount_acl *p2 = container_of(b, typeof(*p2), head);
+       return tomoyo_same_name_union(&p1->dev_name, &p2->dev_name) &&
+               tomoyo_same_name_union(&p1->dir_name, &p2->dir_name) &&
+               tomoyo_same_name_union(&p1->fs_type, &p2->fs_type) &&
+               tomoyo_same_number_union(&p1->flags, &p2->flags);
+}
+
+/**
+ * tomoyo_update_mount_acl - Write "struct tomoyo_mount_acl" list.
+ *
+ * @param: Pointer to "struct tomoyo_acl_param".
+ *
+ * Returns 0 on success, negative value otherwise.
+ *
+ * Caller holds tomoyo_read_lock().
+ */
+static int tomoyo_update_mount_acl(struct tomoyo_acl_param *param)
+{
+       struct tomoyo_mount_acl e = { .head.type = TOMOYO_TYPE_MOUNT_ACL };
+       int error;
+       if (!tomoyo_parse_name_union(param, &e.dev_name) ||
+           !tomoyo_parse_name_union(param, &e.dir_name) ||
+           !tomoyo_parse_name_union(param, &e.fs_type) ||
+           !tomoyo_parse_number_union(param, &e.flags))
+               error = -EINVAL;
+       else
+               error = tomoyo_update_domain(&e.head, sizeof(e), param,
+                                            tomoyo_same_mount_acl, NULL);
+       tomoyo_put_name_union(&e.dev_name);
+       tomoyo_put_name_union(&e.dir_name);
+       tomoyo_put_name_union(&e.fs_type);
+       tomoyo_put_number_union(&e.flags);
+       return error;
+}
+
 /**
  * tomoyo_write_file - Update file related list.
  *
- * @data:      String to parse.
- * @domain:    Pointer to "struct tomoyo_domain_info".
- * @is_delete: True if it is a delete request.
+ * @param: Pointer to "struct tomoyo_acl_param".
  *
  * Returns 0 on success, negative value otherwise.
  *
  * Caller holds tomoyo_read_lock().
  */
-int tomoyo_write_file(char *data, struct tomoyo_domain_info *domain,
-                     const bool is_delete)
+int tomoyo_write_file(struct tomoyo_acl_param *param)
 {
-       char *w[5];
+       u16 perm = 0;
        u8 type;
-       if (!tomoyo_tokenize(data, w, sizeof(w)) || !w[1][0])
-               return -EINVAL;
-       if (strncmp(w[0], "allow_", 6))
-               goto out;
-       w[0] += 6;
-       for (type = 0; type < TOMOYO_MAX_PATH_OPERATION; type++) {
-               if (strcmp(w[0], tomoyo_path_keyword[type]))
-                       continue;
-               return tomoyo_update_path_acl(type, w[1], domain, is_delete);
-       }
-       if (!w[2][0])
-               goto out;
-       for (type = 0; type < TOMOYO_MAX_PATH2_OPERATION; type++) {
-               if (strcmp(w[0], tomoyo_path2_keyword[type]))
-                       continue;
-               return tomoyo_update_path2_acl(type, w[1], w[2], domain,
-                                              is_delete);
-       }
-       for (type = 0; type < TOMOYO_MAX_PATH_NUMBER_OPERATION; type++) {
-               if (strcmp(w[0], tomoyo_path_number_keyword[type]))
-                       continue;
-               return tomoyo_update_path_number_acl(type, w[1], w[2], domain,
-                                                    is_delete);
-       }
-       if (!w[3][0] || !w[4][0])
-               goto out;
-       for (type = 0; type < TOMOYO_MAX_MKDEV_OPERATION; type++) {
-               if (strcmp(w[0], tomoyo_mkdev_keyword[type]))
-                       continue;
-               return tomoyo_update_mkdev_acl(type, w[1], w[2], w[3],
-                                              w[4], domain, is_delete);
-       }
- out:
+       const char *operation = tomoyo_read_token(param);
+       for (type = 0; type < TOMOYO_MAX_PATH_OPERATION; type++)
+               if (tomoyo_permstr(operation, tomoyo_path_keyword[type]))
+                       perm |= 1 << type;
+       if (perm)
+               return tomoyo_update_path_acl(perm, param);
+       for (type = 0; type < TOMOYO_MAX_PATH2_OPERATION; type++)
+               if (tomoyo_permstr(operation,
+                                  tomoyo_mac_keywords[tomoyo_pp2mac[type]]))
+                       perm |= 1 << type;
+       if (perm)
+               return tomoyo_update_path2_acl(perm, param);
+       for (type = 0; type < TOMOYO_MAX_PATH_NUMBER_OPERATION; type++)
+               if (tomoyo_permstr(operation,
+                                  tomoyo_mac_keywords[tomoyo_pn2mac[type]]))
+                       perm |= 1 << type;
+       if (perm)
+               return tomoyo_update_path_number_acl(perm, param);
+       for (type = 0; type < TOMOYO_MAX_MKDEV_OPERATION; type++)
+               if (tomoyo_permstr(operation,
+                                  tomoyo_mac_keywords[tomoyo_pnnn2mac[type]]))
+                       perm |= 1 << type;
+       if (perm)
+               return tomoyo_update_mkdev_acl(perm, param);
+       if (tomoyo_permstr(operation,
+                          tomoyo_mac_keywords[TOMOYO_MAC_FILE_MOUNT]))
+               return tomoyo_update_mount_acl(param);
        return -EINVAL;
 }