aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/ss
diff options
context:
space:
mode:
authorPaul Moore <paul@paul-moore.com>2018-03-01 17:38:30 -0500
committerPaul Moore <paul@paul-moore.com>2018-03-02 14:18:55 -0500
commite5a5ca96a42ca7eee19cf8694377308771350950 (patch)
tree84e47c0215d6e2e6e29df3077c55d8bec7c634ba /security/selinux/ss
parentselinux: wrap global selinux state (diff)
downloadlinux-dev-e5a5ca96a42ca7eee19cf8694377308771350950.tar.xz
linux-dev-e5a5ca96a42ca7eee19cf8694377308771350950.zip
selinux: rename the {is,set}_enforcing() functions
Rename is_enforcing() to enforcing_enabled() and enforcing_set() to set_enforcing(). Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux/ss')
-rw-r--r--security/selinux/ss/services.c6
-rw-r--r--security/selinux/ss/status.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 3698352213d7..4785ca552d51 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -752,7 +752,7 @@ out:
kfree(n);
kfree(t);
- if (!is_enforcing(state))
+ if (!enforcing_enabled(state))
return 0;
return -EPERM;
}
@@ -1596,7 +1596,7 @@ out:
kfree(s);
kfree(t);
kfree(n);
- if (!is_enforcing(state))
+ if (!enforcing_enabled(state))
return 0;
return -EACCES;
}
@@ -1907,7 +1907,7 @@ static inline int convert_context_handle_invalid_context(
char *s;
u32 len;
- if (is_enforcing(state))
+ if (enforcing_enabled(state))
return -EINVAL;
if (!context_struct_to_string(policydb, context, &s, &len)) {
diff --git a/security/selinux/ss/status.c b/security/selinux/ss/status.c
index 043efc59f8e4..a121de45ac0e 100644
--- a/security/selinux/ss/status.c
+++ b/security/selinux/ss/status.c
@@ -56,7 +56,7 @@ struct page *selinux_kernel_status_page(struct selinux_state *state)
status->version = SELINUX_KERNEL_STATUS_VERSION;
status->sequence = 0;
- status->enforcing = is_enforcing(state);
+ status->enforcing = enforcing_enabled(state);
/*
* NOTE: the next policyload event shall set
* a positive value on the status->policyload,