From: "Christian Göttsche" <cgzones@googlemail.com>
To: selinux@vger.kernel.org
Cc: Paul Moore <paul@paul-moore.com>,
Stephen Smalley <stephen.smalley.work@gmail.com>,
Eric Paris <eparis@parisplace.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Ondrej Mosnacek <omosnace@redhat.com>,
James Morris <jamorris@linux.microsoft.com>,
Austin Kim <austin.kim@lge.com>,
Casey Schaufler <casey@schaufler-ca.com>,
Jiapeng Chong <jiapeng.chong@linux.alibaba.com>,
Yang Li <yang.lee@linux.alibaba.com>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev
Subject: [PATCH 3/5] selinux: use consistent pointer types for boolean arrays
Date: Thu, 17 Feb 2022 15:21:26 +0100 [thread overview]
Message-ID: <20220217142133.72205-2-cgzones@googlemail.com> (raw)
In-Reply-To: <20220217142133.72205-1-cgzones@googlemail.com>
Use a consistent type of unsigned int* for boolean arrays, instead of
using implicit casts to and from int*.
Reported by sparse:
security/selinux/selinuxfs.c:1481:30: warning: incorrect type in assignment (different signedness)
security/selinux/selinuxfs.c:1481:30: expected unsigned int *
security/selinux/selinuxfs.c:1481:30: got int *[addressable] values
security/selinux/selinuxfs.c:1398:48: warning: incorrect type in argument 3 (different signedness)
security/selinux/selinuxfs.c:1398:48: expected int *values
security/selinux/selinuxfs.c:1398:48: got unsigned int *bool_pending_values
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
A more invasive change would be to change all boolean arrays to bool*.
---
security/selinux/include/conditional.h | 4 ++--
security/selinux/selinuxfs.c | 2 +-
security/selinux/ss/services.c | 9 +++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/security/selinux/include/conditional.h b/security/selinux/include/conditional.h
index b09343346e3f..9e65aa409318 100644
--- a/security/selinux/include/conditional.h
+++ b/security/selinux/include/conditional.h
@@ -14,9 +14,9 @@
#include "security.h"
int security_get_bools(struct selinux_policy *policy,
- u32 *len, char ***names, int **values);
+ u32 *len, char ***names, unsigned int **values);
-int security_set_bools(struct selinux_state *state, u32 len, int *values);
+int security_set_bools(struct selinux_state *state, u32 len, unsigned int *values);
int security_get_bool_value(struct selinux_state *state, u32 index);
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index f2f6203e0fff..5216a321bbb0 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1428,7 +1428,7 @@ static int sel_make_bools(struct selinux_policy *newpolicy, struct dentry *bool_
struct inode_security_struct *isec;
char **names = NULL, *page;
u32 i, num;
- int *values = NULL;
+ unsigned int *values = NULL;
u32 sid;
ret = -ENOMEM;
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 6901dc07680d..7865926962ab 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -3023,7 +3023,7 @@ int security_fs_use(struct selinux_state *state, struct super_block *sb)
}
int security_get_bools(struct selinux_policy *policy,
- u32 *len, char ***names, int **values)
+ u32 *len, char ***names, unsigned int **values)
{
struct policydb *policydb;
u32 i;
@@ -3045,7 +3045,7 @@ int security_get_bools(struct selinux_policy *policy,
goto err;
rc = -ENOMEM;
- *values = kcalloc(*len, sizeof(int), GFP_ATOMIC);
+ *values = kcalloc(*len, sizeof(unsigned int), GFP_ATOMIC);
if (!*values)
goto err;
@@ -3075,7 +3075,7 @@ int security_get_bools(struct selinux_policy *policy,
}
-int security_set_bools(struct selinux_state *state, u32 len, int *values)
+int security_set_bools(struct selinux_state *state, u32 len, unsigned int *values)
{
struct selinux_policy *newpolicy, *oldpolicy;
int rc;
@@ -3175,7 +3175,8 @@ int security_get_bool_value(struct selinux_state *state,
static int security_preserve_bools(struct selinux_policy *oldpolicy,
struct selinux_policy *newpolicy)
{
- int rc, *bvalues = NULL;
+ int rc;
+ unsigned int *bvalues = NULL;
char **bnames = NULL;
struct cond_bool_datum *booldatum;
u32 i, nbools = 0;
--
2.35.1
next prev parent reply other threads:[~2022-02-17 14:21 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 14:21 [PATCH 2/5] selinux: use correct type for context length Christian Göttsche
2022-02-17 14:21 ` Christian Göttsche [this message]
2022-02-18 16:01 ` [PATCH 3/5] selinux: use consistent pointer types for boolean arrays Paul Moore
2022-03-08 15:57 ` Christian Göttsche
2022-02-17 14:21 ` [PATCH 4/5] selinux: declare data arrays const Christian Göttsche
2022-02-18 16:13 ` Paul Moore
2022-02-18 17:24 ` Nick Desaulniers
2022-02-22 23:16 ` Paul Moore
2022-03-08 16:55 ` [PATCH v2 " Christian Göttsche
2022-04-04 20:03 ` Paul Moore
2022-05-02 14:43 ` [PATCH v3] " Christian Göttsche
2022-05-03 19:59 ` Paul Moore
2022-02-17 14:21 ` [PATCH 5/5] selinux: drop unnecessary NULL check Christian Göttsche
2022-02-18 16:22 ` Paul Moore
2022-02-18 17:31 ` Nick Desaulniers
2022-03-08 16:09 ` Christian Göttsche
2022-05-02 13:43 ` Christian Göttsche
2022-05-04 11:15 ` Ondrej Mosnacek
2022-06-07 21:22 ` Paul Moore
2022-06-07 21:26 ` Nick Desaulniers
2022-06-07 21:35 ` Paul Moore
2022-02-17 14:21 ` [PATCH 1/5] selinux: drop return statement at end of void functions Christian Göttsche
2022-02-18 15:44 ` Paul Moore
2022-02-18 15:47 ` [PATCH 2/5] selinux: use correct type for context length Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220217142133.72205-2-cgzones@googlemail.com \
--to=cgzones@googlemail.com \
--cc=austin.kim@lge.com \
--cc=casey@schaufler-ca.com \
--cc=eparis@parisplace.org \
--cc=jamorris@linux.microsoft.com \
--cc=jiapeng.chong@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--cc=selinux@vger.kernel.org \
--cc=stephen.smalley.work@gmail.com \
--cc=yang.lee@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).