TOMOYO: Add interactive enforcing mode.

Since the behavior of the system is restricted by policy, we may need to update
policy when you update packages.

We need to update policy in the following cases.

    * The pathname of files has changed.
    * The dependency of files has changed.
    * The access permissions required has increased.

The ideal way to update policy is to rebuild from the scratch using learning
mode. But it is not desirable to change from enforcing mode to other mode if
the system has once entered in production state. Suppose MAC could support
per-application enforcing mode, the MAC becomes useless if an application that
is not running in enforcing mode was cracked. For example, the whole system
becomes vulnerable if only HTTP server application is running in learning mode
to rebuild policy for the application. So, in TOMOYO Linux, updating policy is
done while the system is running in enforcing mode.

This patch implements "interactive enforcing mode" which allows administrators
to judge whether to accept policy violation in enforcing mode or not.
A demo movie is available at http://www.youtube.com/watch?v=b9q1Jo25LPA .

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 10 insertions, 14 deletions

diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
index 507be09e93a9..aeac619f787d 100644
--- a/security/tomoyo/mount.c
+++ b/security/tomoyo/mount.c
@@ -178,19 +178,12 @@ static int tomoyo_mount_acl2(struct tomoyo_request_info *r, char *dev_name,
                 error = 0;
                 break;
         }
-        if (error) {
-                const char *dev = tomoyo_get_file_pattern(&rdev)->name;
-                const char *dir = tomoyo_get_file_pattern(&rdir)->name;
-                int len = strlen(dev) + strlen(dir) + strlen(requested_type)
-                        + 64;
-                char *buf = kzalloc(len, GFP_NOFS);
-                if (buf) {
-                        snprintf(buf, len - 1, "%s %s %s 0x%lX",
-                                 dev, dir, requested_type, flags);
-                        tomoyo_write_mount_policy(buf, r->domain, false);
-                        kfree(buf);
-                }
-        }
+        if (error)
+                error = tomoyo_supervisor(r, TOMOYO_KEYWORD_ALLOW_MOUNT
+                                          "%s %s %s 0x%lX\n",
+                                          tomoyo_file_pattern(&rdev),
+                                          tomoyo_file_pattern(&rdir),
+                                          requested_type, flags);
  out:
         kfree(requested_dev_name);
         kfree(requested_dir_name);
@@ -279,7 +272,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name,
                                       TOMOYO_MOUNT_MAKE_SHARED_KEYWORD,
                                       flags & ~MS_SHARED);
         else
-                error = tomoyo_mount_acl2(r, dev_name, dir, type, flags);
+                do {
+                        error = tomoyo_mount_acl2(r, dev_name, dir, type,
+                                                  flags);
+                } while (error == TOMOYO_RETRY_REQUEST);
         if (r->mode != TOMOYO_CONFIG_ENFORCING)
                 error = 0;
         return error;