summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-05-19 10:09:32 -0700
committerPaul Moore <paul@paul-moore.com>2017-05-23 10:24:06 -0400
commit270e8573145a26de924e2dc644596332d400445b (patch)
treeac3278c5a14e41e36b8b2a8918d2194be85c45a1 /security
parent4dc2fce342f8e5b165e2eda29a39446bb07b2457 (diff)
downloadlinux-270e8573145a26de924e2dc644596332d400445b.tar.gz
linux-270e8573145a26de924e2dc644596332d400445b.tar.bz2
linux-270e8573145a26de924e2dc644596332d400445b.zip
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: Matthias Kaehlcke <mka@chromium.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 627f291fb6c1..cfb7ce339adc 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -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;