1 files changed, 54 insertions, 26 deletions

diff --git a/security/tomoyo/load_policy.c b/security/tomoyo/load_policy.c
index 3312e5624f24..67975405140f 100644
--- a/security/tomoyo/load_policy.c
+++ b/security/tomoyo/load_policy.c
@@ -1,15 +1,32 @@
 /*
  * security/tomoyo/load_policy.c
  *
- * Policy loader launcher for TOMOYO.
- *
- * Copyright (C) 2005-2010  NTT DATA CORPORATION
+ * Copyright (C) 2005-2011  NTT DATA CORPORATION
  */
 
 #include "common.h"
 
-/* path to policy loader */
-static const char *tomoyo_loader = "/sbin/tomoyo-init";
+#ifndef CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
+
+/*
+ * Path to the policy loader. (default = CONFIG_SECURITY_TOMOYO_POLICY_LOADER)
+ */
+static const char *tomoyo_loader;
+
+/**
+ * tomoyo_loader_setup - Set policy loader.
+ *
+ * @str: Program to use as a policy loader (e.g. /sbin/tomoyo-init ).
+ *
+ * Returns 0.
+ */
+static int __init tomoyo_loader_setup(char *str)
+{
+        tomoyo_loader = str;
+        return 0;
+}
+
+__setup("TOMOYO_loader=", tomoyo_loader_setup);
 
 /**
  * tomoyo_policy_loader_exists - Check whether /sbin/tomoyo-init exists.
@@ -18,24 +35,38 @@ static const char *tomoyo_loader = "/sbin/tomoyo-init";
  */
 static bool tomoyo_policy_loader_exists(void)
 {
-        /*
-         * 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 every time.
-         */
         struct path path;
-
+        if (!tomoyo_loader)
+                tomoyo_loader = CONFIG_SECURITY_TOMOYO_POLICY_LOADER;
         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);
+                printk(KERN_INFO "Not activating Mandatory Access Control "
+                       "as %s does not exist.\n", tomoyo_loader);
                 return false;
         }
         path_put(&path);
         return true;
 }
 
+/*
+ * Path to the trigger. (default = CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER)
+ */
+static const char *tomoyo_trigger;
+
+/**
+ * tomoyo_trigger_setup - Set trigger for activation.
+ *
+ * @str: Program to use as an activation trigger (e.g. /sbin/init ).
+ *
+ * Returns 0.
+ */
+static int __init tomoyo_trigger_setup(char *str)
+{
+        tomoyo_trigger = str;
+        return 0;
+}
+
+__setup("TOMOYO_trigger=", tomoyo_trigger_setup);
+
 /**
  * tomoyo_load_policy - Run external policy loader to load policy.
  *
@@ -51,24 +82,19 @@ static bool tomoyo_policy_loader_exists(void)
  */
 void tomoyo_load_policy(const char *filename)
 {
+        static bool done;
         char *argv[2];
         char *envp[3];
 
-        if (tomoyo_policy_loaded)
+        if (tomoyo_policy_loaded || done)
                 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"))
+        if (!tomoyo_trigger)
+                tomoyo_trigger = CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER;
+        if (strcmp(filename, tomoyo_trigger))
                 return;
         if (!tomoyo_policy_loader_exists())
                 return;
-
+        done = true;
         printk(KERN_INFO "Calling %s to load policy. Please wait.\n",
                tomoyo_loader);
         argv[0] = (char *) tomoyo_loader;
@@ -79,3 +105,5 @@ void tomoyo_load_policy(const char *filename)
         call_usermodehelper(argv[0], argv, envp, 1);
         tomoyo_check_profile();
 }
+
+#endif