Commit 97842c56 authored by Christian Göttsche's avatar Christian Göttsche Committed by Paul Moore
Browse files

selinux: avoid implicit conversions in selinuxfs code 



Use umode_t as parameter type for sel_make_inode(), which assigns the
value to the member i_mode of struct inode.

Use identical and unsigned types for loop iterators.

Signed-off-by: default avatarChristian Göttsche <cgzones@googlemail.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent aa4b6051

security/selinux/selinuxfs.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ static int selinux_fs_info_create(struct super_block *sb) 
static void selinux_fs_info_free(struct super_block *sb)

static void selinux_fs_info_free(struct super_block *sb)

{

{

	struct selinux_fs_info *fsi = sb->s_fs_info;

	struct selinux_fs_info *fsi = sb->s_fs_info;

	int i;

	unsigned int i;





	if (fsi) {

	if (fsi) {

		for (i = 0; i < fsi->bool_num; i++)

		for (i = 0; i < fsi->bool_num; i++)
@@ -1075,8 +1075,8 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size) 
	u32 sid, *sids = NULL;

	u32 sid, *sids = NULL;

	ssize_t length;

	ssize_t length;

	char *newcon;

	char *newcon;

	int i, rc;

	int rc;

	u32 len, nsids;

	u32 i, len, nsids;





	length = avc_has_perm(current_sid(), SECINITSID_SECURITY,

	length = avc_has_perm(current_sid(), SECINITSID_SECURITY,

			      SECCLASS_SECURITY, SECURITY__COMPUTE_USER,

			      SECCLASS_SECURITY, SECURITY__COMPUTE_USER,
@@ -1192,7 +1192,7 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size) 
	return length;

	return length;

}

}





static struct inode *sel_make_inode(struct super_block *sb, int mode)

static struct inode *sel_make_inode(struct super_block *sb, umode_t mode)

{

{

	struct inode *ret = new_inode(sb);

	struct inode *ret = new_inode(sb);
@@ -1613,7 +1613,7 @@ static int sel_make_avc_files(struct dentry *dir) 
{

{

	struct super_block *sb = dir->d_sb;

	struct super_block *sb = dir->d_sb;

	struct selinux_fs_info *fsi = sb->s_fs_info;

	struct selinux_fs_info *fsi = sb->s_fs_info;

	int i;

	unsigned int i;

	static const struct tree_descr files[] = {

	static const struct tree_descr files[] = {

		{ "cache_threshold",

		{ "cache_threshold",

		  &sel_avc_cache_threshold_ops, S_IRUGO|S_IWUSR },

		  &sel_avc_cache_threshold_ops, S_IRUGO|S_IWUSR },
@@ -1649,7 +1649,7 @@ static int sel_make_ss_files(struct dentry *dir) 
{

{

	struct super_block *sb = dir->d_sb;

	struct super_block *sb = dir->d_sb;

	struct selinux_fs_info *fsi = sb->s_fs_info;

	struct selinux_fs_info *fsi = sb->s_fs_info;

	int i;

	unsigned int i;

	static const struct tree_descr files[] = {

	static const struct tree_descr files[] = {

		{ "sidtab_hash_stats", &sel_sidtab_hash_stats_ops, S_IRUGO },

		{ "sidtab_hash_stats", &sel_sidtab_hash_stats_ops, S_IRUGO },

	};

	};
@@ -1700,7 +1700,7 @@ static const struct file_operations sel_initcon_ops = { 




static int sel_make_initcon_files(struct dentry *dir)

static int sel_make_initcon_files(struct dentry *dir)

{

{

	int i;

	unsigned int i;





	for (i = 1; i <= SECINITSID_NUM; i++) {

	for (i = 1; i <= SECINITSID_NUM; i++) {

		struct inode *inode;

		struct inode *inode;