From: Matthias Kaehlcke Date: Fri, 19 May 2017 17:09:32 +0000 (-0700) Subject: selinux: Remove redundant check for unknown labeling behavior X-Git-Tag: v4.1.52~324 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e07b5dae3b5b1245c44de25b44ea2ac65366d4e;p=thirdparty%2Fkernel%2Fstable.git selinux: Remove redundant check for unknown labeling behavior [ Upstream commit 270e8573145a26de924e2dc644596332d400445b ] 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: Matthias Kaehlcke Acked-by: Stephen Smalley Signed-off-by: Paul Moore Signed-off-by: Sasha Levin --- diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index de5c282cfd6fe..de1e43f6adf1c 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -321,18 +321,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 int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dentry); static inline int inode_doinit(struct inode *inode) @@ -444,10 +432,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;