selinux: use int arrays for boolean values

Do not cast pointers of signed integers to pointers of unsigned integers
and vice versa.

It should currently not be an issue since they hold SELinux boolean
values which should only contain either 0's or 1's, which should have
the same representation.

Reported by sparse:

  .../selinuxfs.c:1485:30: warning: incorrect type in assignment
                                    (different signedness)
  .../selinuxfs.c:1485:30:    expected unsigned int *
  .../selinuxfs.c:1485:30:    got int *[addressable] values
  .../selinuxfs.c:1402:48: warning: incorrect type in argument 3
                                    (different signedness)
  .../selinuxfs.c:1402:48:    expected int *values
  .../selinuxfs.c:1402:48:    got unsigned int *bool_pending_values

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
[PM: minor whitespace fixes, sparse output cleanup]
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 66610eb3d317a9473c3e40d0c2949eef7ee5e222..a00d191394365b50fd59fcdda75ba8f1343ec1f9 100644 (file)
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -71,7 +71,7 @@ struct selinux_fs_info {
        struct dentry *bool_dir;
        unsigned int bool_num;
        char **bool_pending_names;
-       unsigned int *bool_pending_values;
+       int *bool_pending_values;
        struct dentry *class_dir;
        unsigned long last_class_ino;
        bool policy_opened;
@@ -356,7 +356,7 @@ static const struct file_operations sel_policyvers_ops = {
 /* declaration for sel_write_load */
 static int sel_make_bools(struct selinux_policy *newpolicy, struct dentry *bool_dir,
                          unsigned int *bool_num, char ***bool_pending_names,
-                         unsigned int **bool_pending_values);
+                         int **bool_pending_values);
 static int sel_make_classes(struct selinux_policy *newpolicy,
                            struct dentry *class_dir,
                            unsigned long *last_class_ino);
@@ -527,7 +527,7 @@ static const struct file_operations sel_policy_ops = {
 };
 
 static void sel_remove_old_bool_data(unsigned int bool_num, char **bool_names,
-                               unsigned int *bool_values)
+                                    int *bool_values)
 {
        u32 i;
 
@@ -545,7 +545,7 @@ static int sel_make_policy_nodes(struct selinux_fs_info *fsi,
        struct dentry *tmp_parent, *tmp_bool_dir, *tmp_class_dir, *old_dentry;
        unsigned int tmp_bool_num, old_bool_num;
        char **tmp_bool_names, **old_bool_names;
-       unsigned int *tmp_bool_values, *old_bool_values;
+       int *tmp_bool_values, *old_bool_values;
        unsigned long tmp_ino = fsi->last_ino; /* Don't increment last_ino in this function */
 
        tmp_parent = sel_make_disconnected_dir(fsi->sb, &tmp_ino);
@@ -1423,7 +1423,7 @@ static void sel_remove_entries(struct dentry *de)
 
 static int sel_make_bools(struct selinux_policy *newpolicy, struct dentry *bool_dir,
                          unsigned int *bool_num, char ***bool_pending_names,
-                         unsigned int **bool_pending_values)
+                         int **bool_pending_values)
 {
        int ret;
        ssize_t len;