From: Amit Pundir Date: Tue, 26 Apr 2016 10:21:20 +0000 (+0530) Subject: Revert "SELinux: Enable setting security contexts on rootfs inodes." X-Git-Tag: firefly_0821_release~176^2~399^2~19 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ab378c0ed26df68765c2930fd9ab3f3935424b53;p=firefly-linux-kernel-4.4.55.git Revert "SELinux: Enable setting security contexts on rootfs inodes." This reverts commit 78d36d2111cd4ca722a602846f7db8f54a0b074c. Drop this duplicate patch. This patch is already upstreamed in v4.4. Commits 5c73fceb8c70 (SELinux: Enable setting security contexts on rootfs inodes.), 12f348b9dcf6 (SELinux: rename SE_SBLABELSUPP to SBLABEL_MNT), and b43e725d8d38 (SELinux: use a helper function to determine seclabel), for reference. Signed-off-by: Amit Pundir --- diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d4d12949de09..9b0586d0f3c4 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -464,13 +464,6 @@ static int sb_finish_set_opts(struct super_block *sb) if (selinux_is_sblabel_mnt(sb)) 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; - /* Initialize the root inode. */ rc = inode_doinit_with_dentry(root_inode, root);