[PATCH] selinux: Clear selinux_enabled flag upon runtime disable.
Clear selinux_enabled flag upon runtime disable of SELinux by userspace, and make sure it is defined even if selinux= boot parameter support is not enabled in configuration. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@namei.org> Tested-by: Jon Smirl <jonsmirl@gmail.com> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
e17df688f7
commit
30d55280b8
2 changed files with 3 additions and 5 deletions
|
@ -101,6 +101,8 @@ static int __init selinux_enabled_setup(char *str)
|
|||
return 1;
|
||||
}
|
||||
__setup("selinux=", selinux_enabled_setup);
|
||||
#else
|
||||
int selinux_enabled = 1;
|
||||
#endif
|
||||
|
||||
/* Original (dummy) security module. */
|
||||
|
@ -4535,6 +4537,7 @@ int selinux_disable(void)
|
|||
printk(KERN_INFO "SELinux: Disabled at runtime.\n");
|
||||
|
||||
selinux_disabled = 1;
|
||||
selinux_enabled = 0;
|
||||
|
||||
/* Reset security_ops to the secondary module, dummy or capability. */
|
||||
security_ops = secondary_ops;
|
||||
|
|
|
@ -29,12 +29,7 @@
|
|||
#define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE
|
||||
#define POLICYDB_VERSION_MAX POLICYDB_VERSION_AVTAB
|
||||
|
||||
#ifdef CONFIG_SECURITY_SELINUX_BOOTPARAM
|
||||
extern int selinux_enabled;
|
||||
#else
|
||||
#define selinux_enabled 1
|
||||
#endif
|
||||
|
||||
extern int selinux_mls_enabled;
|
||||
|
||||
int security_load_policy(void * data, size_t len);
|
||||
|
|
Loading…
Reference in a new issue