diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-04-26 15:51:06 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2016-04-26 16:24:43 +0530 |
| commit | 5a0725f49f3ab0ebada002e1d4b13943c3a35d18 (patch) | |
| tree | 554bb8f509e8284d11a1108788bcea500444e24a /security/selinux/hooks.c | |
| parent | 00ee836d89c5756b4e937eae58c9d0d1d7ffe560 (diff) | |
Revert "SELinux: build fix for 4.1"
This reverts commit 43e1b4f528e1654fadd1097f7cc5c50be6e45b77.
This patch is part of code which 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/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 78d06ff4eeb7..d4d12949de09 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -469,7 +469,7 @@ static int sb_finish_set_opts(struct super_block *sb) * setting SELinux context on in-core inodes. */ if (strncmp(sb->s_type->name, "rootfs", sizeof("rootfs")) == 0) - sbsec->flags |= SBLABEL_MNT; + sbsec->flags |= SE_SBLABELSUPP; /* Initialize the root inode. */ rc = inode_doinit_with_dentry(root_inode, root); |