p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Matthias Kaehlcke 2017-05-19 10:09:32 -07:00 committed by Paul Moore
parent 4dc2fce342
commit 270e857314
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/selinux/hooks.c
View File

@ -398,18 +398,6 @@ static void superblock_free_security(struct super_block *sb)
kfree(sbsec); 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) static inline int inode_doinit(struct inode *inode)
{ {
return inode_doinit_with_dentry(inode, NULL); 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; sbsec->flags |= SE_SBINITIALIZED;
if (selinux_is_sblabel_mnt(sb)) if (selinux_is_sblabel_mnt(sb))
sbsec->flags |= SBLABEL_MNT; sbsec->flags |= SBLABEL_MNT;