aboutsummaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2009-11-05 17:03:20 -0800
committerJames Morris <jmorris@namei.org>2009-11-09 08:40:07 +1100
commit6e65f92ff0d6f18580737321718d09035085a3fb (patch)
tree2edfad79128d1b48e0b4ad49abdfbfcf2a1a2a48 /security/security.c
parent0e1a6ef2dea88101b056b6d9984f3325c5efced3 (diff)
downloadmrst-s0i3-test-6e65f92ff0d6f18580737321718d09035085a3fb.tar.gz
mrst-s0i3-test-6e65f92ff0d6f18580737321718d09035085a3fb.tar.xz
mrst-s0i3-test-6e65f92ff0d6f18580737321718d09035085a3fb.zip
Config option to set a default LSM
The LSM currently requires setting a kernel parameter at boot to select a specific LSM. This adds a config option that allows specifying a default LSM that is used unless overridden with the security= kernel parameter. If the the config option is not set the current behavior of first LSM to register is used. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c
index 684d5ee655d..aad71b2ca19 100644
--- a/security/security.c
+++ b/security/security.c
@@ -19,7 +19,8 @@
#include <linux/ima.h>
/* Boot-time LSM user choice */
-static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1];
+static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
+ CONFIG_DEFAULT_SECURITY;
/* things that live in capability.c */
extern struct security_operations default_security_ops;
@@ -80,8 +81,10 @@ __setup("security=", choose_lsm);
*
* Return true if:
* -The passed LSM is the one chosen by user at boot time,
- * -or user didn't specify a specific LSM and we're the first to ask
- * for registration permission,
+ * -or the passed LSM is configured as the default and the user did not
+ * choose an alternate LSM at boot time,
+ * -or there is no default LSM set and the user didn't specify a
+ * specific LSM and we're the first to ask for registration permission,
* -or the passed LSM is currently loaded.
* Otherwise, return false.
*/