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

Commit 12f348b9 authored by Eric Paris's avatar Eric Paris
Browse files

SELinux: rename SE_SBLABELSUPP to SBLABEL_MNT 



Just a flag rename as we prepare to make it not so special.

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

security/selinux/hooks.c

+14 −14
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int sb_finish_set_opts(struct super_block *sb) 
		}

	}



	sbsec->flags |= (SE_SBINITIALIZED | SE_SBLABELSUPP);

	sbsec->flags |= (SE_SBINITIALIZED | SBLABEL_MNT);



	if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors))

		printk(KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n",
@@ -401,18 +401,18 @@ static int sb_finish_set_opts(struct super_block *sb) 
	    sbsec->behavior == SECURITY_FS_USE_MNTPOINT ||

	    sbsec->behavior == SECURITY_FS_USE_NONE ||

	    sbsec->behavior > ARRAY_SIZE(labeling_behaviors))

		sbsec->flags &= ~SE_SBLABELSUPP;

		sbsec->flags &= ~SBLABEL_MNT;



	/* Special handling for sysfs. Is genfs but also has setxattr handler*/

	if (strncmp(sb->s_type->name, "sysfs", sizeof("sysfs")) == 0)

		sbsec->flags |= SE_SBLABELSUPP;

		sbsec->flags |= SBLABEL_MNT;



	/*

	 * Special handling for rootfs. Is genfs but supports

	 * setting SELinux context on in-core inodes.

	 */

	if (strncmp(sb->s_type->name, "rootfs", sizeof("rootfs")) == 0)

		sbsec->flags |= SE_SBLABELSUPP;

		sbsec->flags |= SBLABEL_MNT;



	/* Initialize the root inode. */

	rc = inode_doinit_with_dentry(root_inode, root);
@@ -477,7 +477,7 @@ static int selinux_get_mnt_opts(const struct super_block *sb, 
		tmp >>= 1;

	}

	/* Check if the Label support flag is set */

	if (sbsec->flags & SE_SBLABELSUPP)

	if (sbsec->flags & SBLABEL_MNT)

		opts->num_mnt_opts++;



	opts->mnt_opts = kcalloc(opts->num_mnt_opts, sizeof(char *), GFP_ATOMIC);
@@ -524,9 +524,9 @@ static int selinux_get_mnt_opts(const struct super_block *sb, 
		opts->mnt_opts[i] = context;

		opts->mnt_opts_flags[i++] = ROOTCONTEXT_MNT;

	}

	if (sbsec->flags & SE_SBLABELSUPP) {

	if (sbsec->flags & SBLABEL_MNT) {

		opts->mnt_opts[i] = NULL;

		opts->mnt_opts_flags[i++] = SE_SBLABELSUPP;

		opts->mnt_opts_flags[i++] = SBLABEL_MNT;

	}



	BUG_ON(i != opts->num_mnt_opts);
@@ -615,7 +615,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, 
	for (i = 0; i < num_opts; i++) {

		u32 sid;



		if (flags[i] == SE_SBLABELSUPP)

		if (flags[i] == SBLABEL_MNT)

			continue;

		rc = security_context_to_sid(mount_options[i],

					     strlen(mount_options[i]), &sid);
@@ -1025,7 +1025,7 @@ static void selinux_write_opts(struct seq_file *m, 
		case DEFCONTEXT_MNT:

			prefix = DEFCONTEXT_STR;

			break;

		case SE_SBLABELSUPP:

		case SBLABEL_MNT:

			seq_putc(m, ',');

			seq_puts(m, LABELSUPP_STR);

			continue;
@@ -1624,7 +1624,7 @@ static int may_create(struct inode *dir, 
	if (rc)

		return rc;



	if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) {

	if (!newsid || !(sbsec->flags & SBLABEL_MNT)) {

		rc = security_transition_sid(sid, dsec->sid, tclass,

					     &dentry->d_name, &newsid);

		if (rc)
@@ -2412,7 +2412,7 @@ static int selinux_sb_remount(struct super_block *sb, void *data) 
		u32 sid;

		size_t len;



		if (flags[i] == SE_SBLABELSUPP)

		if (flags[i] == SBLABEL_MNT)

			continue;

		len = strlen(mount_options[i]);

		rc = security_context_to_sid(mount_options[i], len, &sid);
@@ -2546,7 +2546,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, 
	if ((sbsec->flags & SE_SBINITIALIZED) &&

	    (sbsec->behavior == SECURITY_FS_USE_MNTPOINT))

		newsid = sbsec->mntpoint_sid;

	else if (!newsid || !(sbsec->flags & SE_SBLABELSUPP)) {

	else if (!newsid || !(sbsec->flags & SBLABEL_MNT)) {

		rc = security_transition_sid(sid, dsec->sid,

					     inode_mode_to_security_class(inode->i_mode),

					     qstr, &newsid);
@@ -2568,7 +2568,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, 
		isec->initialized = 1;

	}



	if (!ss_initialized || !(sbsec->flags & SE_SBLABELSUPP))

	if (!ss_initialized || !(sbsec->flags & SBLABEL_MNT))

		return -EOPNOTSUPP;



	if (name) {
@@ -2776,7 +2776,7 @@ static int selinux_inode_setxattr(struct dentry *dentry, const char *name, 
		return selinux_inode_setotherxattr(dentry, name);



	sbsec = inode->i_sb->s_security;

	if (!(sbsec->flags & SE_SBLABELSUPP))

	if (!(sbsec->flags & SBLABEL_MNT))

		return -EOPNOTSUPP;



	if (!inode_owner_or_capable(inode))

security/selinux/include/security.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
/* Non-mount related flags */

#define SE_SBINITIALIZED	0x10

#define SE_SBPROC		0x20

#define SE_SBLABELSUPP	0x40

#define SBLABEL_MNT	0x40



#define CONTEXT_STR	"context="

#define FSCONTEXT_STR	"fscontext="