diff options
author | Matthias Kaehlcke <mka@chromium.org> | 2017-05-19 13:09:32 -0400 |
---|---|---|
committer | Paul Moore <paul@paul-moore.com> | 2017-05-23 10:24:06 -0400 |
commit | 270e8573145a26de924e2dc644596332d400445b (patch) | |
tree | ac3278c5a14e41e36b8b2a8918d2194be85c45a1 /security/selinux/hooks.c | |
parent | 4dc2fce342f8e5b165e2eda29a39446bb07b2457 (diff) |
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/selinux/hooks.c')
-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 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) | |||
398 | kfree(sbsec); | 398 | kfree(sbsec); |
399 | } | 399 | } |
400 | 400 | ||
401 | /* The file system's label must be initialized prior to use. */ | ||
402 | |||
403 | static const char *labeling_behaviors[7] = { | ||
404 | "uses xattr", | ||
405 | "uses transition SIDs", | ||
406 | "uses task SIDs", | ||
407 | "uses genfs_contexts", | ||
408 | "not configured for labeling", | ||
409 | "uses mountpoint labeling", | ||
410 | "uses native labeling", | ||
411 | }; | ||
412 | |||
413 | static inline int inode_doinit(struct inode *inode) | 401 | static inline int inode_doinit(struct inode *inode) |
414 | { | 402 | { |
415 | return inode_doinit_with_dentry(inode, NULL); | 403 | return inode_doinit_with_dentry(inode, NULL); |
@@ -524,10 +512,6 @@ static int sb_finish_set_opts(struct super_block *sb) | |||
524 | } | 512 | } |
525 | } | 513 | } |
526 | 514 | ||
527 | if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors)) | ||
528 | printk(KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n", | ||
529 | sb->s_id, sb->s_type->name); | ||
530 | |||
531 | sbsec->flags |= SE_SBINITIALIZED; | 515 | sbsec->flags |= SE_SBINITIALIZED; |
532 | if (selinux_is_sblabel_mnt(sb)) | 516 | if (selinux_is_sblabel_mnt(sb)) |
533 | sbsec->flags |= SBLABEL_MNT; | 517 | sbsec->flags |= SBLABEL_MNT; |