diff options
author | James Morris <jmorris@namei.org> | 2008-07-10 04:02:07 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-07-14 01:04:06 -0400 |
commit | 6f0f0fd496333777d53daff21a4e3b28c4d03a6d (patch) | |
tree | 202de67376fce2547b44ae5b016d6424c3c7409c /security/capability.c | |
parent | 93cbace7a058bce7f99319ef6ceff4b78cf45051 (diff) |
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/capability.c')
-rw-r--r-- | security/capability.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/security/capability.c b/security/capability.c index 6e0671c82018..5b01c0b02422 100644 --- a/security/capability.c +++ b/security/capability.c | |||
@@ -721,12 +721,6 @@ static int cap_xfrm_decode_session(struct sk_buff *skb, u32 *fl, int ckall) | |||
721 | } | 721 | } |
722 | 722 | ||
723 | #endif /* CONFIG_SECURITY_NETWORK_XFRM */ | 723 | #endif /* CONFIG_SECURITY_NETWORK_XFRM */ |
724 | static int cap_register_security(const char *name, | ||
725 | struct security_operations *ops) | ||
726 | { | ||
727 | return -EINVAL; | ||
728 | } | ||
729 | |||
730 | static void cap_d_instantiate(struct dentry *dentry, struct inode *inode) | 724 | static void cap_d_instantiate(struct dentry *dentry, struct inode *inode) |
731 | { | 725 | { |
732 | } | 726 | } |
@@ -940,7 +934,6 @@ void security_fixup_ops(struct security_operations *ops) | |||
940 | set_to_cap_if_null(ops, sem_semop); | 934 | set_to_cap_if_null(ops, sem_semop); |
941 | set_to_cap_if_null(ops, netlink_send); | 935 | set_to_cap_if_null(ops, netlink_send); |
942 | set_to_cap_if_null(ops, netlink_recv); | 936 | set_to_cap_if_null(ops, netlink_recv); |
943 | set_to_cap_if_null(ops, register_security); | ||
944 | set_to_cap_if_null(ops, d_instantiate); | 937 | set_to_cap_if_null(ops, d_instantiate); |
945 | set_to_cap_if_null(ops, getprocattr); | 938 | set_to_cap_if_null(ops, getprocattr); |
946 | set_to_cap_if_null(ops, setprocattr); | 939 | set_to_cap_if_null(ops, setprocattr); |