summaryrefslogtreecommitdiffstats
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
parentaa8e712cee93d520e96a2ca8e3a20f807c937e3f (diff)
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:
752 kfree(n); 752 kfree(n);
753 kfree(t); 753 kfree(t);
754 754
755 if (!is_enforcing(state)) 755 if (!enforcing_enabled(state))
756 return 0; 756 return 0;
757 return -EPERM; 757 return -EPERM;
758} 758}
@@ -1596,7 +1596,7 @@ out:
1596 kfree(s); 1596 kfree(s);
1597 kfree(t); 1597 kfree(t);
1598 kfree(n); 1598 kfree(n);
1599 if (!is_enforcing(state)) 1599 if (!enforcing_enabled(state))
1600 return 0; 1600 return 0;
1601 return -EACCES; 1601 return -EACCES;
1602} 1602}
@@ -1907,7 +1907,7 @@ static inline int convert_context_handle_invalid_context(
1907 char *s; 1907 char *s;
1908 u32 len; 1908 u32 len;
1909 1909
1910 if (is_enforcing(state)) 1910 if (enforcing_enabled(state))
1911 return -EINVAL; 1911 return -EINVAL;
1912 1912
1913 if (!context_struct_to_string(policydb, context, &s, &len)) { 1913 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)
56 56
57 status->version = SELINUX_KERNEL_STATUS_VERSION; 57 status->version = SELINUX_KERNEL_STATUS_VERSION;
58 status->sequence = 0; 58 status->sequence = 0;
59 status->enforcing = is_enforcing(state); 59 status->enforcing = enforcing_enabled(state);
60 /* 60 /*
61 * NOTE: the next policyload event shall set 61 * NOTE: the next policyload event shall set
62 * a positive value on the status->policyload, 62 * a positive value on the status->policyload,