diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2019-12-17 17:15:10 +0300 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2019-12-19 05:22:46 +0300 |
| commit | 6c5a682e6497cb1f7a67303ce098462a36bed362 (patch) | |
| tree | 2164f187397e93da543e872b363b7347bf8f56ba /security/selinux/netport.c | |
| parent | 210a292874517782bed2e2220c7beb1608d3b05d (diff) | |
| download | linux-6c5a682e6497cb1f7a67303ce098462a36bed362.tar.xz | |
selinux: clean up selinux_enabled/disabled/enforcing_boot
Rename selinux_enabled to selinux_enabled_boot to make it clear that
it only reflects whether SELinux was enabled at boot. Replace the
references to it in the MAC_STATUS audit log in sel_write_enforce()
with hardcoded "1" values because this code is only reachable if SELinux
is enabled and does not change its value, and update the corresponding
MAC_STATUS audit log in sel_write_disable(). Stop clearing
selinux_enabled in selinux_disable() since it is not used outside of
initialization code that runs before selinux_disable() can be reached.
Mark both selinux_enabled_boot and selinux_enforcing_boot as __initdata
since they are only used in initialization code.
Wrap the disabled field in the struct selinux_state with
CONFIG_SECURITY_SELINUX_DISABLE since it is only used for
runtime disable.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux/netport.c')
| -rw-r--r-- | security/selinux/netport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/netport.c b/security/selinux/netport.c index 3f8b2c0458c8..de727f7489b7 100644 --- a/security/selinux/netport.c +++ b/security/selinux/netport.c @@ -225,7 +225,7 @@ static __init int sel_netport_init(void) { int iter; - if (!selinux_enabled) + if (!selinux_enabled_boot) return 0; for (iter = 0; iter < SEL_NETPORT_HASH_SIZE; iter++) { |