Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Stephen Smalley Newsgroups: linux.kernel Subject: Re: [PATCH] selinux: Remove redundant check for unknown labeling behavior Date: Fri, 19 May 2017 19:30:02 +0200 Message-ID: References: X-Ironport-Av: E=Sophos;i="5.38,365,1491264000"; d="scan'208";a="5947631" Ironport-Phdr: =?us-ascii?q?9a23=3Aq107Cxz1U+uty77XCy+O+j09IxM/srCxBDY+r6Qd?= =?us-ascii?q?0ukVLPad9pjvdHbS+e9qxAeQG96KtLQe0qGP6vmocFdDyK7JiGoFfp1IWk1Nou?= =?us-ascii?q?QttCtkPvS4D1bmJuXhdS0wEZcKflZk+3amLRodQ56mNBXdrXKo8DEdBAj0OxZr?= =?us-ascii?q?KeTpAI7SiNm82/yv95HJbQhFgDiwbalsIBmrogndq9QajZZ/Iast1xXFpWdFdf?= =?us-ascii?q?5Lzm1yP1KTmBj85sa0/JF99ilbpuws+c1dX6jkZqo0VbNXAigoPGAz/83rqALM?= =?us-ascii?q?TRCT6XsGU2UZiQRHDg7Y5xznRJjxsy/6tu1g2CmGOMD9UL45VSi+46ptVRTlkz?= =?us-ascii?q?kMOSIn/27Li8xwlKNbrwynpxxj2I7ffYWZOONjcq/BYd8WQGxMUchLVyxFH4iy?= =?us-ascii?q?cY0BAeQcNupctoXxuUcCoR64CAKxBu3g1yVIi2f106Mn0+ovDw/I0w4uH9IJrH?= =?us-ascii?q?vaq9r6OqgJXOCpz6TF1ynPYulK1Tr/7oXDbxAvoeuLXbJ1acff1FUvGB3djlWQ?= =?us-ascii?q?t4PlOS6e2PkIs2eB6+pgUfygim46oAx2uTig29wsh5LVhoMV1l/E9SJ5zJwzJd?= =?us-ascii?q?2jUkF3e9GkEJxOtyyDMYZ9X8AsQ3lwtSonxbALtoS3cSgXxJg92RLSZOKLf5KV?= =?us-ascii?q?7h/lSe2fOy13hGh/d7K6nxuy9E+gxfDiWcSsy1ZKqzZFksHLtnAQyxzf8siHRe?= =?us-ascii?q?V5/kemwTuPyxrc6vtFIUApjqrXMYIhw74smZoTtkTPBCn2l1ntjKCKbEkk/+mo?= =?us-ascii?q?6+D/brXnoJ+TKZN0hxnjPqkhlcGzG+Q1PhUUU2SF9umwyqfv8VDhTLVPlPI2k6?= =?us-ascii?q?3ZsJ7AJcQco660GxRV3Zs46xukEzen0MgXnXkALF5ffhKHlJLmN0vBIPD/E/ez?= =?us-ascii?q?m06snytzx/DaIr3hBY3ALnzCkLfnYLZ85FdQyAktwtBF4ZJbFLUBLentWk/+qt?= =?us-ascii?q?PYFAU1Mw+qzOb9DtVyyIceVXiIAq+DP6PYqUWI6f43I+mQeI8Vvy7wK/wk5/7o?= =?us-ascii?q?kH84lkYRfbK30pQLdXC4BPVmI1mZYHb1h9cBFnoFvhc6TOP0k1CCTzFTaGioX6?= =?us-ascii?q?4m5TE0FpimDYHdSYCpmrCB2z27HpJObGBcFl+MCWvod5mDW/oUcyKdPNVhkjMa?= =?us-ascii?q?WrW6S48uzxWutAv6yrphNObb5ioYtZf73thv++LTjQ0y9SBzD8mF0WGCVWR0kX?= =?us-ascii?q?0TRzMs2KBzu0l9ylCZ0ahigvxYDsde5/RTUgggKZHcy/J1B8ruVQLGe9eDUEym?= =?us-ascii?q?Tcm+ATEtUtIxxMcDbFhlG9q4lBDD3jGqDqQNl7ORHpw087nc32D1J8ln13nJyr?= =?us-ascii?q?Mtj148QstALWemnLJw9xDPB47VlEWUj76qer4B3C7J72qD1XCBvFxcUAJpVKXF?= =?us-ascii?q?WncfZlHIotjj+kzCSLquA6w9MgRd0c6CNrdKatrxgFVDR/fsIs/TbH6xm2eqAh?= =?us-ascii?q?aIw7KMbJfve2kH2yXdEkcEwEgv+iOjPBQiBiaouCr9BTFuEVnsbgu49Op3gHi7?= =?us-ascii?q?VEgxzhyPKUp72OzxsiYcmPjUbvQUxL9M7D8otjFcBF+g25fTDN2aqkxqe6AKJZ?= =?us-ascii?q?sQ+lZMnVrQrQ1mdsitN6l4h0U2aw1tvlj20xx8B8NHi8d86DsIxQ9/Muq910lb?= =?us-ascii?q?dijQiZL5P7DMbG20+Re1ca/N8lbE2d2S9+EE7/Fu7x2phwyzGUdq3j0hm/lc13?= =?us-ascii?q?+N4N+CWBEfS538ekY+8xxroffRZSxrtK3O0ng5CrW5qj/P3ZoSAeIhzhuxN4NE?= =?us-ascii?q?PLisCB75E8pcAdOnbuMthQ76PVo/IOlO+ftsbIudfPyc1fvuZbw4kQ=3D=3D?= X-Ipas-Result: =?us-ascii?q?A2EZAgAZKR9Z/wHyM5BcGgEBAQECAQEBAQgBAQEBFgEBAQM?= =?us-ascii?q?BAQEJAQEBgwEpgW6DbppcBoEmmAWGJAKFelcBAQEBAQEBAQIBAmgogjMkAYJBA?= =?us-ascii?q?QUjBAsBRhAJAg0BCgICJgICVwYBEogHghANkwydYIFsOiYCim8BAQEBAQUBAQE?= =?us-ascii?q?BAQEigQuFDoIkgxuHdYJgAQSJRoZijW2THIsbhlOURliBCiYJAh4IHw+FPRyBf?= =?us-ascii?q?yQ2iRwBAQE?= Organization: National Security Agency Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6 (3.22.6-2.fc25) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 54 X-Original-Cc: selinux@tycho.nsa.gov, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org X-Original-Date: Fri, 19 May 2017 13:27:15 -0400 X-Original-Message-ID: <1495214835.2209.15.camel@tycho.nsa.gov> X-Original-References: <20170519170932.67192-1-mka@chromium.org> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1645781 On Fri, 2017-05-19 at 10:09 -0700, 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 Acked-by: Stephen Smalley > --- >  security/selinux/hooks.c | 16 ---------------- >  1 file changed, 16 deletions(-) > > 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;