From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756289AbdESSnE (ORCPT ); Fri, 19 May 2017 14:43:04 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33886 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbdESSnC (ORCPT ); Fri, 19 May 2017 14:43:02 -0400 MIME-Version: 1.0 X-Originating-IP: [108.49.102.27] In-Reply-To: <20170519170932.67192-1-mka@chromium.org> References: <20170519170932.67192-1-mka@chromium.org> From: Paul Moore Date: Fri, 19 May 2017 14:43:00 -0400 Message-ID: Subject: Re: [PATCH] selinux: Remove redundant check for unknown labeling behavior To: Matthias Kaehlcke Cc: Stephen Smalley , Eric Paris , James Morris , "Serge E . Hallyn" , selinux@tycho.nsa.gov, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 19, 2017 at 1:09 PM, Matthias Kaehlcke wrote: > 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 > --- > security/selinux/hooks.c | 16 ---------------- > 1 file changed, 16 deletions(-) Merged, thanks everyone. > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index e67a526d1f30..2e0227b0304f 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; > -- > 2.13.0.303.g4ebf302169-goog > -- paul moore www.paul-moore.com