Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfca0303 authored by Eric Paris's avatar Eric Paris
Browse files

SELinux: renumber the superblock options 



Just to make it clear that we have mount time options and flags,
separate them.  Since I decided to move the non-mount options above
above 0x10, we need a short instead of a char.  (x86 padding says
this takes up no additional space as we have a 3byte whole in the
structure)

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent eadcabc6

security/selinux/include/objsec.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct superblock_security_struct { 
	u32 def_sid;			/* default SID for labeling */

	u32 mntpoint_sid;		/* SECURITY_FS_USE_MNTPOINT context for files */

	unsigned int behavior;		/* labeling behavior */

	unsigned char flags;		/* which mount options were specified */

	unsigned short flags;		/* which mount options were specified */

	struct mutex lock;

	struct list_head isec_head;

	spinlock_t isec_lock;

security/selinux/include/security.h

+4 −3
Original line number Diff line number Diff line
@@ -45,14 +45,15 @@ 
/* Mask for just the mount related flags */

#define SE_MNTMASK	0x0f

/* 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

#define FSCONTEXT_MNT	0x02

#define ROOTCONTEXT_MNT	0x04

#define DEFCONTEXT_MNT	0x08

#define SBLABEL_MNT	0x10

/* Non-mount related flags */

#define SE_SBINITIALIZED	0x10

#define SE_SBPROC		0x20

#define SBLABEL_MNT	0x40

#define SE_SBINITIALIZED	0x0100

#define SE_SBPROC		0x0200



#define CONTEXT_STR	"context="

#define FSCONTEXT_STR	"fscontext="