diff options
author | Amit Pundir <amit.pundir@linaro.org> | 2016-04-26 15:51:20 +0530 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2016-04-26 16:24:47 +0530 |
commit | 66daa5f5e2b9078a7cecf37e896385aeee520005 (patch) | |
tree | d716dbb6ee3a995102f9987f38d70ff5f3d51a2a /security | |
parent | 5a0725f49f3ab0ebada002e1d4b13943c3a35d18 (diff) |
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 <amit.pundir@linaro.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/hooks.c | 7 |
1 files changed, 0 insertions, 7 deletions
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); |