From 68d142069c22d4385603eb3a711d8ded2e1f60a0 Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Thu, 16 Mar 2017 15:26:52 -0700 Subject: [PATCH] UPSTREAM: 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 Signed-off-by: Paul Moore Link: https://git.kernel.org/linus/342e91578eb6909529bc7095964cd44b9c057c4e Signed-off-by: Nathan Chancellor Change-Id: Iacc441a51a908c5fc3fcbd7874802b8eb889f828 --- security/selinux_n/ss/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/selinux_n/ss/services.c b/security/selinux_n/ss/services.c index 82f078bde54..cb33711919b 100644 --- a/security/selinux_n/ss/services.c +++ b/security/selinux_n/ss/services.c @@ -154,7 +154,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++; -- 2.20.1