Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754141AbYCBLDT (ORCPT ); Sun, 2 Mar 2008 06:03:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753263AbYCBLDB (ORCPT ); Sun, 2 Mar 2008 06:03:01 -0500 Received: from ug-out-1314.google.com ([66.249.92.174]:16915 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752433AbYCBLC7 (ORCPT ); Sun, 2 Mar 2008 06:02:59 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent:from; b=N8mCVB5355FYj7enjPMNk3kT+L9DsW+O3xI4/TwfwKkO4yDtSlFDtcOi4zoJip5R2hYNOddBuibN4WP19CxvdF0qd7qWwFmkGviPXxiLsDb7mJ2hY7xIOp5PQxVLOEq1mzSiSF2X1M3e/4IT+TM3vClvn4N7nfXI3BVpiFCojtk= Date: Sun, 2 Mar 2008 12:59:46 +0200 To: Casey Schaufler Cc: Adrian Bunk , Chris Wright , Stephen Smalley , James Morris , Eric Paris , Alexey Dobriyan , LKML , LSM-ML , Anrew Morton Subject: [PATCH -v3 -mm] LSM: Add security= boot parameter Message-ID: <20080302105946.GA6406@ubuntu> References: <20080301211108.GF25835@cs181133002.pp.htv.fi> <674864.46980.qm@web36615.mail.mud.yahoo.com> <20080301232708.GA625@ubuntu> <20080302074912.GA3215@ubuntu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080302074912.GA3215@ubuntu> User-Agent: Mutt/1.5.15+20070412 (2007-04-11) From: "Ahmed S. Darwish" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9069 Lines: 266 Hi!, [ Fixed two bugs: - concurrency: incrementing and testing atomic_t in different places. - overflow: not ending string with NULL after using strncpy(). - I'll never write a patch when I'm asleep, sorry :( Added more verbose messages to SMACK and SELinux if they were not chosen on boot. Casey: Failing to take permission to register an LSM does not mean that the other has registered its security_ops yet. It just means that the other asked for allowance to call register_security(). It's not yet guraranteed that this registration succeeded. This means that adding "SELinux: failed to load, LSM %s is loaded" may lead to %s = "dummy" in case of a highly concurrent SMP system. ] --> Add the security= boot parameter. This is done to avoid LSM registration clashes in case of more than one bult-in module. User can choose a security module to enable at boot. If no security= boot parameter is specified, only the first LSM asking for registration will be loaded. An invalid security module name will be treated as if no module has been chosen. LSM modules must check now if they are allowed to register by calling security_module_enable(ops) first. Modify SELinux and SMACK to do so. Signed-off-by: Ahmed S. Darwish --- Documentation/kernel-parameters.txt | 6 ++++ include/linux/security.h | 12 +++++++++ security/dummy.c | 2 - security/security.c | 46 +++++++++++++++++++++++++++++++++--- security/selinux/hooks.c | 12 +++++++++ security/smack/smack_lsm.c | 11 ++++++++ 6 files changed, 85 insertions(+), 4 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c64dfd7..85044e8 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -374,6 +374,12 @@ and is between 256 and 4096 characters. It is defined in the file possible to determine what the correct size should be. This option provides an override for these situations. + security= [SECURITY] Choose a security module to enable at boot. + If this boot parameter is not specified, only the first + security module asking for security registration will be + loaded. An invalid security module name will be treated + as if no module has been chosen. + capability.disable= [SECURITY] Disable capabilities. This would normally be used only if an alternative security model is to be diff --git a/include/linux/security.h b/include/linux/security.h index a33fd03..601318a 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -42,6 +42,9 @@ extern unsigned securebits; +/* Maximum number of letters for an LSM name string */ +#define SECURITY_NAME_MAX 10 + struct ctl_table; /* @@ -117,6 +120,12 @@ struct request_sock; /** * struct security_operations - main security structure * + * Security module identifier. + * + * @name: + * A string that acts as a unique identifeir for the LSM with max number + * of characters = SECURITY_NAME_MAX. + * * Security hooks for program execution operations. * * @bprm_alloc_security: @@ -1218,6 +1227,8 @@ struct request_sock; * This is the main security structure. */ struct security_operations { + char name[SECURITY_NAME_MAX + 1]; + int (*ptrace) (struct task_struct * parent, struct task_struct * child); int (*capget) (struct task_struct * target, kernel_cap_t * effective, @@ -1477,6 +1488,7 @@ struct security_operations { /* prototypes */ extern int security_init (void); +extern int security_module_enable(struct security_operations *ops); extern int register_security (struct security_operations *ops); extern int mod_reg_security (const char *name, struct security_operations *ops); extern struct dentry *securityfs_create_file(const char *name, mode_t mode, diff --git a/security/dummy.c b/security/dummy.c index 6a0056b..d0910f2 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -986,7 +986,7 @@ static int dummy_key_getsecurity(struct key *key, char **_buffer) #endif /* CONFIG_KEYS */ -struct security_operations dummy_security_ops; +struct security_operations dummy_security_ops = { "dummy" }; #define set_to_dummy_if_null(ops, function) \ do { \ diff --git a/security/security.c b/security/security.c index 3e75b90..6f2df1a 100644 --- a/security/security.c +++ b/security/security.c @@ -17,6 +17,9 @@ #include #include +/* Boot-time LSM user choice */ +static char chosen_lsm[SECURITY_NAME_MAX + 1]; +static atomic_t security_ops_enabled = ATOMIC_INIT(-1); /* things that live in dummy.c */ extern struct security_operations dummy_security_ops; @@ -30,7 +33,7 @@ unsigned long mmap_min_addr = CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR; static inline int verify(struct security_operations *ops) { /* verify the security_operations structure exists */ - if (!ops) + if (!ops || !ops->name) return -EINVAL; security_fixup_ops(ops); return 0; @@ -67,13 +70,51 @@ int __init security_init(void) return 0; } +/* Save user chosen LSM */ +static int __init choose_lsm(char *str) +{ + strncpy(chosen_lsm, str, SECURITY_NAME_MAX); + chosen_lsm[SECURITY_NAME_MAX] = NULL; + + return 1; +} +__setup("security=", choose_lsm); + +/** + * security_module_enable - Load given security module on boot ? + * @ops: a pointer to the struct security_operations that is to be checked. + * + * Each LSM must pass this method before registering its own operations + * to avoid security registration races. + * + * Return true if: + * -The passed LSM is the one chosen by user at boot time, + * -or user didsn't specify a specific LSM and we're the first to ask + * for registeration permissoin. + * Otherwise, return false. + */ +int security_module_enable(struct security_operations *ops) +{ + if (!ops || !ops->name) + return 0; + + if (!*chosen_lsm && atomic_inc_and_test(&security_ops_enabled)) + return 1; + + if (!strncmp(ops->name, chosen_lsm, SECURITY_NAME_MAX)) + return 1; + + return 0; +} + /** * register_security - registers a security framework with the kernel * @ops: a pointer to the struct security_options that is to be registered * * This function is to allow a security module to register itself with the * kernel security subsystem. Some rudimentary checking is done on the @ops - * value passed to this function. + * value passed to this function. You'll need to check first if your LSM + * is allowed to register its @ops by calling security_module_enable(@ops). * * If there is already a security module registered with the kernel, * an error will be returned. Otherwise 0 is returned on success. diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index f42ebfc..b507977 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -5233,6 +5233,8 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) #endif static struct security_operations selinux_ops = { + .name = "selinux", + .ptrace = selinux_ptrace, .capget = selinux_capget, .capset_check = selinux_capset_check, @@ -5425,6 +5427,15 @@ static __init int selinux_init(void) return 0; } + if (!security_module_enable(&selinux_ops)) { + selinux_enabled = 0; + printk(KERN_INFO "SELinux: Security registration was not allowed.\n"); + printk(KERN_INFO "SELinux: Another security module was chosen.\n"); + printk(KERN_INFO "SELinux: Use security=%s to force choosing " + "SELinux on boot.\n", selinux_ops.name); + return 0; + } + printk(KERN_INFO "SELinux: Initializing.\n"); /* Set the security state for the initial task. */ diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 2b5d6f7..2e1adbb 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -2358,6 +2358,8 @@ static void smack_release_secctx(char *secdata, u32 seclen) } static struct security_operations smack_ops = { + .name = "smack", + .ptrace = smack_ptrace, .capget = cap_capget, .capset_check = cap_capset_check, @@ -2485,6 +2487,14 @@ static struct security_operations smack_ops = { */ static __init int smack_init(void) { + if (!security_module_enable(&smack_ops)) { + printk(KERN_INFO "Smack: Security registration was not allowed.\n"); + printk(KERN_INFO "Smack: Another security module was chosen.\n"); + printk(KERN_INFO "Smack: Use security=%s to force choosing " + "Smack on boot.\n", smack_ops.name); + return 0; + } + printk(KERN_INFO "Smack: Initializing.\n"); /* --- "Better to light a candle, than curse the darkness" Ahmed S. Darwish Homepage: http://darwish.07.googlepages.com Blog: http://darwish-07.blogspot.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/