]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selinux: Remove unnecessary check of array base in selinux_set_mapping()
authorMatthias Kaehlcke <mka@chromium.org>
Thu, 16 Mar 2017 22:26:52 +0000 (15:26 -0700)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:56 +0000 (21:33 -0400)
[ Upstream commit 342e91578eb6909529bc7095964cd44b9c057c4e ]

'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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
security/selinux/ss/services.c

index 31d1d2ebd6f2fdd58b8e7ffeabd5def47f900dbc..f20b2b0a2a546b74d1488784fc71897c104f728f 100644 (file)
@@ -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++;