summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-08-24 15:59:21 -0400
committerEric Paris <eparis@redhat.com>2013-07-25 13:03:12 -0400
commit308ab70c465d97cf7e3168961dfd365535de21a6 (patch)
tree36c14a71bf0dade0d63e6f9d32407364ccc29b8b /security
parentf936c6e502d3bc21b87c9830b3a24d1e07e6b6e1 (diff)
downloadop-kernel-dev-308ab70c465d97cf7e3168961dfd365535de21a6.zip
op-kernel-dev-308ab70c465d97cf7e3168961dfd365535de21a6.tar.gz
SELinux: do not handle seclabel as a special flag
Instead of having special code around the 'non-mount' seclabel mount option just handle it like the mount options. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c3
-rw-r--r--security/selinux/include/security.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index ca0a1c6..5596dc5 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -474,9 +474,6 @@ static int selinux_get_mnt_opts(const struct super_block *sb,
opts->num_mnt_opts++;
tmp >>= 1;
}
- /* Check if the Label support flag is set */
- if (sbsec->flags & SBLABEL_MNT)
- opts->num_mnt_opts++;
opts->mnt_opts = kcalloc(opts->num_mnt_opts, sizeof(char *), GFP_ATOMIC);
if (!opts->mnt_opts) {
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index 20830be..1a73fcd 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -43,7 +43,7 @@
#endif
/* Mask for just the mount related flags */
-#define SE_MNTMASK 0x0f
+#define SE_MNTMASK 0x1f
/* Super block security struct flags for mount options */
/* BE CAREFUL, these need to be the low order bits for selinux_get_mnt_opts */
#define CONTEXT_MNT 0x01
OpenPOWER on IntegriCloud