aboutsummaryrefslogtreecommitdiff
path: root/security/security.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-07-10 17:02:07 +0900
committerJames Morris <jmorris@namei.org>2008-07-14 15:04:06 +1000
commit6f0f0fd496333777d53daff21a4e3b28c4d03a6d (patch)
tree202de67376fce2547b44ae5b016d6424c3c7409c /security/security.c
parent93cbace7a058bce7f99319ef6ceff4b78cf45051 (diff)
downloadlinux-2.6.34-ux500-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/security.c')
-rw-r--r--security/security.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/security/security.c b/security/security.c
index 30b0278de39..59f23b5918b 100644
--- a/security/security.c
+++ b/security/security.c
@@ -125,35 +125,6 @@ int register_security(struct security_operations *ops)
return 0;
}
-/**
- * mod_reg_security - allows security modules to be "stacked"
- * @name: a pointer to a string with the name of the security_options to be registered
- * @ops: a pointer to the struct security_options that is to be registered
- *
- * This function allows security modules to be stacked if the currently loaded
- * security module allows this to happen. It passes the @name and @ops to the
- * register_security function of the currently loaded security module.
- *
- * The return value depends on the currently loaded security module, with 0 as
- * success.
- */
-int mod_reg_security(const char *name, struct security_operations *ops)
-{
- if (verify(ops)) {
- printk(KERN_INFO "%s could not verify "
- "security operations.\n", __func__);
- return -EINVAL;
- }
-
- if (ops == security_ops) {
- printk(KERN_INFO "%s security operations "
- "already registered.\n", __func__);
- return -EINVAL;
- }
-
- return security_ops->register_security(name, ops);
-}
-
/* Security operations */
int security_ptrace(struct task_struct *parent, struct task_struct *child,