aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-03-16 15:26:52 -0700
committerPaul Moore <paul@paul-moore.com>2017-03-29 18:57:25 -0400
commit342e91578eb6909529bc7095964cd44b9c057c4e (patch)
treefbfd92bbee0e5e29bed643a09021c234bcb2d4e3
parentfs: switch order of CAP_DAC_OVERRIDE and CAP_DAC_READ_SEARCH checks (diff)
downloadlinux-dev-342e91578eb6909529bc7095964cd44b9c057c4e.tar.xz
linux-dev-342e91578eb6909529bc7095964cd44b9c057c4e.zip
selinux: Remove unnecessary check of array base in selinux_set_mapping()
'perms' will never be NULL since it isn't a plain pointer but an array of u32 values. This fixes the following warning when building with clang: security/selinux/ss/services.c:158:16: error: address of array 'p_in->perms' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] while (p_in->perms && p_in->perms[k]) { Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Paul Moore <paul@paul-moore.com>
-rw-r--r--security/selinux/ss/services.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index b4aa491a0a23..60d9b0252321 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -157,7 +157,7 @@ static int selinux_set_mapping(struct policydb *pol,
}
k = 0;
- while (p_in->perms && p_in->perms[k]) {
+ while (p_in->perms[k]) {
/* An empty permission string skips ahead */
if (!*p_in->perms[k]) {
k++;