summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2016-12-06 10:27:28 -0800
committerPaul Moore <paul@paul-moore.com>2016-12-07 18:36:58 -0500
commit8591af6dc45617a5f04854cb8debb8f59d981632 (patch)
tree951855140582520a718b1e2593b404eff07ea596 /security
parent79c8b348f215f6efdac6bd51190c3ee4b869fc64 (diff)
downloadlinux-8591af6dc45617a5f04854cb8debb8f59d981632.tar.gz
linux-8591af6dc45617a5f04854cb8debb8f59d981632.tar.xz
selinux: add security in-core xattr support for tracefs
Since kernel 4.1 ftrace is supported as a new separate filesystem. It gets automatically mounted by the kernel under the old path /sys/kernel/debug/tracing. Because it lives now on a separate filesystem SELinux needs to be updated to also support setting SELinux labels on tracefs inodes. This is required for compatibility in Android when moving to Linux 4.1 or newer. Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Signed-off-by: William Roberts <william.c.roberts@intel.com> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index b4402b2c12e9..8a90a0b8c1e1 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -492,6 +492,7 @@ static int selinux_is_sblabel_mnt(struct super_block *sb)
!strcmp(sb->s_type->name, "sysfs") ||
!strcmp(sb->s_type->name, "pstore") ||
!strcmp(sb->s_type->name, "debugfs") ||
+ !strcmp(sb->s_type->name, "tracefs") ||
!strcmp(sb->s_type->name, "rootfs");
}