[PATCH] selinux: Remove redundant check for unknown labeling behavior

Subsystems: selinux security module, the rest

STALE3368d

3 messages, 3 authors, 2017-05-19 · open the first message on its own page

[PATCH] selinux: Remove redundant check for unknown labeling behavior

From: Matthias Kaehlcke <mka@chromium.org>
Date: 2017-05-19 17:09:46

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>
---
 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;

-- 
2.13.0.303.g4ebf302169-goog

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] selinux: Remove redundant check for unknown labeling behavior

From: Stephen Smalley <hidden>
Date: 2017-05-19 17:26:13

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 <mka@chromium.org>

Acked-by: Stephen Smalley <redacted>

quoted hunk

---
?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;

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] selinux: Remove redundant check for unknown labeling behavior

From: Paul Moore <paul@paul-moore.com>
Date: 2017-05-19 18:43:04

On Fri, May 19, 2017 at 1:09 PM, Matthias Kaehlcke [off-list ref] 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 <mka@chromium.org>
---
 security/selinux/hooks.c | 16 ----------------
 1 file changed, 16 deletions(-)

Merged, thanks everyone.

quoted hunk

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
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help