Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 270e8573 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Paul Moore
Browse files

selinux: Remove redundant check for unknown labeling behavior 



The check is already performed in ocontext_read() when the policy is
loaded. Removing the array also fixes the following warning when
building with clang:

security/selinux/hooks.c:338:20: error: variable 'labeling_behaviors'
    is not needed and will not be emitted
    [-Werror,-Wunneeded-internal-declaration]

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 4dc2fce3

security/selinux/hooks.c

+0 −16
Original line number Diff line number Diff line
@@ -398,18 +398,6 @@ static void superblock_free_security(struct super_block *sb) 
	kfree(sbsec);

}



/* The file system's label must be initialized prior to use. */



static const char *labeling_behaviors[7] = {

	"uses xattr",

	"uses transition SIDs",

	"uses task SIDs",

	"uses genfs_contexts",

	"not configured for labeling",

	"uses mountpoint labeling",

	"uses native labeling",

};



static inline int inode_doinit(struct inode *inode)

{

	return inode_doinit_with_dentry(inode, NULL);
@@ -524,10 +512,6 @@ static int sb_finish_set_opts(struct super_block *sb) 
		}

	}



	if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors))

		printk(KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n",

		       sb->s_id, sb->s_type->name);



	sbsec->flags |= SE_SBINITIALIZED;

	if (selinux_is_sblabel_mnt(sb))

		sbsec->flags |= SBLABEL_MNT;