Commit 308ab70c authored by Eric Paris's avatar Eric Paris
Browse files

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: default avatarEric Paris <eparis@redhat.com>
parent f936c6e5

security/selinux/hooks.c

+0 −3
Original line number Diff line number Diff line
@@ -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) {

security/selinux/include/security.h

+1 −1
Original line number Diff line number Diff line
@@ -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