Skip to content

Commit

Permalink
selinux: Remove redundant check for unknown labeling behavior
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthias Kaehlcke authored and Paul Moore committed May 23, 2017
1 parent 4dc2fce commit 270e857
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 270e857

Please sign in to comment.