From: Matthias Kaehlcke <mka@chromium.org>
Date: Thu, 16 Mar 2017 22:26:52 +0000 (-0700)
Subject: UPSTREAM: selinux: Remove unnecessary check of array base in selinux_set_mapping()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=68d142069c22d4385603eb3a711d8ded2e1f60a0;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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 <mka@chromium.org>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Link: https://git.kernel.org/linus/342e91578eb6909529bc7095964cd44b9c057c4e
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Change-Id: Iacc441a51a908c5fc3fcbd7874802b8eb889f828
---

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++;