Security: add static to security_ops and default_security_ops variable
Subsystems (2)
PATCH 1/1 Security: add static to security_ops and default_security_ops variable
I resent this patch using mutt, thanks for your helping:)
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.
--- include/linux/security.h | 2 ++ security/capability.c | 4 ---- security/security.c | 11 +++++++++-- security/selinux/hooks.c | 13 +------------ 4 files changed, 12 insertions(+), 18 deletions(-)
include/linux/security.h +2 -0
@@ -95,6 +95,8 @@ struct seq_file;extern int cap_netlink_send (struct sock *sk,struct sk_buff *skb);extern int cap_netlink_recv (struct sk_buff *skb,int cap); +void reset_security_ops (void ); +#ifdef CONFIG_MMU extern unsigned long mmap_min_addr;extern unsigned long dac_mmap_min_addr;
security/capability.c +0 -4
@@ -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) { \
security/security.c +9 -2
@@ -23,10 +23,12 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =CONFIG_DEFAULT_SECURITY ;/* things that live in capability.c */ -extern struct security_operations default_security_ops;extern void security_fixup_ops (struct security_operations *ops); -struct security_operations *security_ops;/* Initialized to NULL */ +static struct security_operations *security_ops; +static struct security_operations default_security_ops = { + .name ="default" , +};static inline int verify (struct security_operations *ops) {
@@ -63,6 +65,11 @@ int __init security_init(void)return 0 ; } +void reset_security_ops (void ) +{ + security_ops = &default_security_ops; +} +/* Save user chosen LSM */ static int __init choose_lsm (char *str) {
security/selinux/hooks.c +1 -12
@@ -125,13 +125,6 @@ __setup("selinux=", selinux_enabled_setup);int selinux_enabled =1 ;#endif - -/* -* Minimal support for a secondary security module, -* just to allow the use of the capability module. -*/ -static struct security_operations *secondary_ops; -/* Lists of inode and superblock security structures initialized before the policy was loaded. */ static LIST_HEAD (superblock_security_head);
@@ -5672,9 +5665,6 @@ static __init int selinux_init(void) 0, SLAB_PANIC, NULL);avc_init (); - secondary_ops = security_ops; -if (!secondary_ops) -panic ("SELinux: No initial security operations\n" );if (register_security (&selinux_ops))panic ("SELinux: Unable to register with kernel.\n" );
@@ -5835,8 +5825,7 @@ int selinux_disable(void) selinux_disabled =1 ; selinux_enabled =0 ; -/* Reset security_ops to the secondary module, dummy or capability. */ - security_ops = secondary_ops; +reset_security_ops ();/* Try to destroy the avc node cache */ avc_disable ();
Signature · 1 line
1.6.5.3
Quoted 14 lines · On Tue, 2010-02-23 at 23:15 +0800, [email protected] wrote:
I resent this patch using mutt, thanks for your helping:)
Enhance the security framework to support resetting the active security module. This eliminates the need for direct use of the
security_opsanddefault_security_opsvariables outside ofsecurity.c, so makesecurity_opsanddefault_security_opsstatic. Also remove thesecondary_opsvariable as a cleanup since there is no use for that.secondary_opswas 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_opsfor this purpose since that is now available.
Quoted 1 line
Signed-off-by Zhitong Wang <[email protected]>
Quoted 105 lines
--- include/linux/security.h | 2 ++ security/capability.c | 4 ---- security/security.c | 11 +++++++++-- security/selinux/hooks.c | 13 +------------ 4 files changed, 12 insertions(+), 18 deletions(-)include/linux/security.h +2
-0@@ -95,6 +95,8 @@ struct seq_file;extern int cap_netlink_send (struct sock *sk,struct sk_buff *skb);extern int cap_netlink_recv (struct sk_buff *skb,int cap); +void reset_security_ops (void ); +#ifdef CONFIG_MMU extern unsigned long mmap_min_addr;extern unsigned long dac_mmap_min_addr;security/capability.c +0
-4@@ -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) { \security/security.c +9
-2@@ -23,10 +23,12 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =CONFIG_DEFAULT_SECURITY ;/* things that live in capability.c */ -extern struct security_operations default_security_ops;extern void security_fixup_ops (struct security_operations *ops); -struct security_operations *security_ops;/* Initialized to NULL */ +static struct security_operations *security_ops; +static struct security_operations default_security_ops = { + .name ="default" , +};static inline int verify (struct security_operations *ops) {@@ -63,6 +65,11 @@ int __init security_init(void)return 0 ; } +void reset_security_ops (void ) +{ + security_ops = &default_security_ops; +} +/* Save user chosen LSM */ static int __init choose_lsm (char *str) {security/selinux/hooks.c +1
-12@@ -125,13 +125,6 @@ __setup("selinux=", selinux_enabled_setup);int selinux_enabled =1 ;#endif - -/* -* Minimal support for a secondary security module, -* just to allow the use of the capability module. -*/ -static struct security_operations *secondary_ops; -/* Lists of inode and superblock security structures initialized before the policy was loaded. */ static LIST_HEAD (superblock_security_head);@@ -5672,9 +5665,6 @@ static __init int selinux_init(void) 0, SLAB_PANIC, NULL);avc_init (); - secondary_ops = security_ops; -if (!secondary_ops) -panic ("SELinux: No initial security operations\n" );if (register_security (&selinux_ops))panic ("SELinux: Unable to register with kernel.\n" );@@ -5835,8 +5825,7 @@ int selinux_disable(void) selinux_disabled =1 ; selinux_enabled =0 ; -/* Reset security_ops to the secondary module, dummy or capability. */ - security_ops = secondary_ops; +reset_security_ops ();/* Try to destroy the avc node cache */ avc_disable ();
Signature · 2 lines
Stephen Smalley National Security Agency
James Morris
maintainerQuoted 12 lines · On Tue, 23 Feb 2010, [email protected] wrote:
Enhance the security framework to support resetting the active security module. This eliminates the need for direct use of the
security_opsanddefault_security_opsvariables outside ofsecurity.c, so makesecurity_opsanddefault_security_opsstatic. Also remove thesecondary_opsvariable as a cleanup since there is no use for that.secondary_opswas 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_opsfor this purpose since that is now available.
Quoted 1 line
Signed-off-by Zhitong Wang <[email protected]>
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
Signature · 2 lines
James Morris <[email protected]>