summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-03-16 15:26:52 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-08 11:51:57 +0200
commit76fa23e7de139b47f4eb34c3d7338890ac671a3b (patch)
tree998e2610983cf70f34f16bfc14fea706459a8512 /security
parent2abc2436c9294c63d885ec754a165a25a3446ed9 (diff)
selinux: Remove unnecessary check of array base in selinux_set_mapping()
commit 342e91578eb6909529bc7095964cd44b9c057c4e upstream. '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> Cc: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-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 db7eff3573a9..23dca68ffe25 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -155,7 +155,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++;