Yama: remove needless CONFIG_SECURITY_YAMA_STACKED

Now that minor LSMs can cleanly stack with major LSMs, remove the unneeded
config for Yama to be made to explicitly stack. Just selecting the main
Yama CONFIG will allow it to work, regardless of the major LSM. Since
distros using Yama are already forcing it to stack, this is effectively
a no-op change.

Additionally add MAINTAINERS entry.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.l.morris@oracle.com>

4 files changed, 14 insertions, 43 deletions

diff --git a/security/Kconfig b/security/Kconfig
index bf4ec46474b6..e45237897b43 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -132,7 +132,6 @@ choice
         default DEFAULT_SECURITY_SMACK if SECURITY_SMACK
         default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO
         default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR
-        default DEFAULT_SECURITY_YAMA if SECURITY_YAMA
         default DEFAULT_SECURITY_DAC
 
         help
@@ -151,9 +150,6 @@ choice
         config DEFAULT_SECURITY_APPARMOR
                 bool "AppArmor" if SECURITY_APPARMOR=y
 
-        config DEFAULT_SECURITY_YAMA
-                bool "Yama" if SECURITY_YAMA=y
-
         config DEFAULT_SECURITY_DAC
                 bool "Unix Discretionary Access Controls"
 
@@ -165,7 +161,6 @@ config DEFAULT_SECURITY
         default "smack" if DEFAULT_SECURITY_SMACK
         default "tomoyo" if DEFAULT_SECURITY_TOMOYO
         default "apparmor" if DEFAULT_SECURITY_APPARMOR
-        default "yama" if DEFAULT_SECURITY_YAMA
         default "" if DEFAULT_SECURITY_DAC
 
 endmenu
diff --git a/security/security.c b/security/security.c
index 595fffab48b0..e693ffcf9266 100644
--- a/security/security.c
+++ b/security/security.c
@@ -56,18 +56,13 @@ int __init security_init(void)
         pr_info("Security Framework initialized\n");
 
         /*
-         * Always load the capability module.
+         * Load minor LSMs, with the capability module always first.
          */
         capability_add_hooks();
-#ifdef CONFIG_SECURITY_YAMA_STACKED
-        /*
-         * If Yama is configured for stacking load it next.
-         */
         yama_add_hooks();
-#endif
+
         /*
-         * Load the chosen module if there is one.
-         * This will also find yama if it is stacking
+         * Load all the remaining security modules.
          */
         do_security_initcalls();
 
diff --git a/security/yama/Kconfig b/security/yama/Kconfig
index 3123e1da2fed..90c605eea892 100644
--- a/security/yama/Kconfig
+++ b/security/yama/Kconfig
@@ -6,14 +6,7 @@ config SECURITY_YAMA
           This selects Yama, which extends DAC support with additional
           system-wide security settings beyond regular Linux discretionary
           access controls. Currently available is ptrace scope restriction.
+          Like capabilities, this security module stacks with other LSMs.
           Further information can be found in Documentation/security/Yama.txt.
 
           If you are unsure how to answer this question, answer N.
-
-config SECURITY_YAMA_STACKED
-        bool "Yama stacked with other LSMs"
-        depends on SECURITY_YAMA
-        default n
-        help
-          When Yama is built into the kernel, force it to stack with the
-          selected primary LSM.
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 9ed32502470e..d3c19c970a06 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -353,11 +353,6 @@ static struct security_hook_list yama_hooks[] = {
         LSM_HOOK_INIT(task_free, yama_task_free),
 };
 
-void __init yama_add_hooks(void)
-{
-        security_add_hooks(yama_hooks, ARRAY_SIZE(yama_hooks));
-}
-
 #ifdef CONFIG_SYSCTL
 static int yama_dointvec_minmax(struct ctl_table *table, int write,
                                 void __user *buffer, size_t *lenp, loff_t *ppos)
@@ -396,25 +391,18 @@ static struct ctl_table yama_sysctl_table[] = {
         },
         { }
 };
-#endif /* CONFIG_SYSCTL */
-
-static __init int yama_init(void)
+static void __init yama_init_sysctl(void)
 {
-#ifndef CONFIG_SECURITY_YAMA_STACKED
-        /*
-         * If yama is being stacked this is already taken care of.
-         */
-        if (!security_module_enable("yama"))
-                return 0;
-#endif
-        pr_info("Yama: becoming mindful.\n");
-
-#ifdef CONFIG_SYSCTL
         if (!register_sysctl_paths(yama_sysctl_path, yama_sysctl_table))
                 panic("Yama: sysctl registration failed.\n");
-#endif
-
-        return 0;
 }
+#else
+static inline void yama_init_sysctl(void) { }
+#endif /* CONFIG_SYSCTL */
 
-security_initcall(yama_init);
+void __init yama_add_hooks(void)
+{
+        pr_info("Yama: becoming mindful.\n");
+        security_add_hooks(yama_hooks, ARRAY_SIZE(yama_hooks));
+        yama_init_sysctl();
+}