diff options
| author | James Morris <jmorris@namei.org> | 2008-07-10 17:02:07 +0900 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-07-14 15:04:06 +1000 |
| commit | 6f0f0fd496333777d53daff21a4e3b28c4d03a6d (patch) | |
| tree | 202de67376fce2547b44ae5b016d6424c3c7409c /security/smack | |
| parent | 93cbace7a058bce7f99319ef6ceff4b78cf45051 (diff) | |
| download | op-kernel-dev-6f0f0fd496333777d53daff21a4e3b28c4d03a6d.zip op-kernel-dev-6f0f0fd496333777d53daff21a4e3b28c4d03a6d.tar.gz | |
security: remove register_security hook
The register security hook is no longer required, as the capability
module is always registered. LSMs wishing to stack capability as
a secondary module should do so explicitly.
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_lsm.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 3c7150b..ee5a51c 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -1822,27 +1822,6 @@ static void smack_ipc_getsecid(struct kern_ipc_perm *ipp, u32 *secid) *secid = smack_to_secid(smack); } -/* module stacking operations */ - -/** - * smack_register_security - stack capability module - * @name: module name - * @ops: module operations - ignored - * - * Allow the capability module to register. - */ -static int smack_register_security(const char *name, - struct security_operations *ops) -{ - if (strcmp(name, "capability") != 0) - return -EINVAL; - - printk(KERN_INFO "%s: Registering secondary module %s\n", - __func__, name); - - return 0; -} - /** * smack_d_instantiate - Make sure the blob is correct on an inode * @opt_dentry: unused @@ -2673,8 +2652,6 @@ struct security_operations smack_ops = { .netlink_send = cap_netlink_send, .netlink_recv = cap_netlink_recv, - .register_security = smack_register_security, - .d_instantiate = smack_d_instantiate, .getprocattr = smack_getprocattr, |
