diff options
| author | wzt.wzt@gmail.com <wzt.wzt@gmail.com> | 2010-02-23 23:15:28 +0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-02-24 08:11:02 +1100 |
| commit | 189b3b1c89761054fee3438f063d7f257306e2d8 (patch) | |
| tree | 8099352fa731fca91b95d862ac0d7199f21ca54d /security/capability.c | |
| parent | 2ae3ba39389b51d8502123de0a59374bec899c4d (diff) | |
| download | lwn-189b3b1c89761054fee3438f063d7f257306e2d8.tar.gz lwn-189b3b1c89761054fee3438f063d7f257306e2d8.zip | |
Security: add static to security_ops and default_security_ops variable
Enhance the security framework to support resetting the active security
module. This eliminates the need for direct use of the security_ops and
default_security_ops variables outside of security.c, so make security_ops
and default_security_ops static. Also remove the secondary_ops variable as
a cleanup since there is no use for that. secondary_ops was originally used by
SELinux to call the "secondary" security module (capability or dummy),
but that was replaced by direct calls to capability and the only
remaining use is to save and restore the original security ops pointer
value if SELinux is disabled by early userspace based on /etc/selinux/config.
Further, if we support this directly in the security framework, then we can
just use &default_security_ops for this purpose since that is now available.
Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/security/capability.c b/security/capability.c index 5c700e1a4fd3..4875142b858d 100644 --- a/security/capability.c +++ b/security/capability.c @@ -906,10 +906,6 @@ static void cap_audit_rule_free(void *lsmrule) } #endif /* CONFIG_AUDIT */ -struct security_operations default_security_ops = { - .name = "default", -}; - #define set_to_cap_if_null(ops, function) \ do { \ if (!ops->function) { \ |