SELinux: remove crazy contortions around proc (40d3d0b8) · Commits · 戴 / test

We check if the fsname is proc and if so set the proc superblock security struct flag. We then check if the flag is set and use the string 'proc' for the fsname instead of just using the fsname. What's the point? It's always proc... Get rid of the useless conditional. Signed-off-by:

Eric Paris <eparis@redhat.com>

security/selinux/hooks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -678,7 +678,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
		sbsec->flags \|= SE_SBPROC;

		/* Determine the labeling behavior to use for this filesystem type. */
		rc = security_fs_use((sbsec->flags & SE_SBPROC) ? "proc" : sb->s_type->name, &sbsec->behavior, &sbsec->sid);
		rc = security_fs_use(sb->s_type->name, &sbsec->behavior, &sbsec->sid);
		if (rc) {
		printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n",
		__func__, sb->s_type->name, rc);

Admin message