diff options
| author | Matthias Kaehlcke <mka@chromium.org> | 2017-05-19 10:09:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-08 11:51:58 +0200 |
| commit | eca9e0aff522167860b8ef1aee4cc416d7b13dbd (patch) | |
| tree | f477b27e4c25979cd77cf69b593390c995e338f7 /security | |
| parent | 46e7cb4d7cf7552c62f15290d7c7cedc8b4c6b9a (diff) | |
| download | linux-stable-eca9e0aff522167860b8ef1aee4cc416d7b13dbd.tar.gz linux-stable-eca9e0aff522167860b8ef1aee4cc416d7b13dbd.tar.bz2 linux-stable-eca9e0aff522167860b8ef1aee4cc416d7b13dbd.zip | |
selinux: Remove redundant check for unknown labeling behavior
commit 270e8573145a26de924e2dc644596332d400445b upstream.
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>
[natechancellor: inode_doinit_with_dentry still present]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 4c7db967b7bb..4f690ab0feed 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -333,18 +333,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) @@ -456,10 +444,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; |