2 files changed, 1 insertions, 4 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index ca0a1c671f0e..5596dc51e21b 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 20830be6b61f..1a73fcd51d56 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