summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-01-07 20:27:15 +0300
committerMark Salyzyn <salyzyn@google.com>2015-01-16 01:25:19 +0300
commit563897de4a217ee19a4dfbade23d75a0ef024550 (patch)
treeb54142fec1e781be865b6cddd1a8035eae531651
parent28207c2a82a6fce9080ae340c67baf26ad13b69f (diff)
downloadlinux-sunxi-mirror/android-3.0.tar.xz
pstore: selinux: add security in-core xattr support for rootfs, pstore and debugfsmirror/android-3.0
- add "rootfs", "pstore" and "debugfs" to list of in-core exceptions - change fstype checks to boolean equation - change from strncmp to strcmp for checking (Cherry Pick from commit 2294d499b7969df3838becf5e58bf16b0e3c86c8) Signed-off-by: Mark Salyzyn <salyzyn@google.com> Bug: 18917345 Bug: 18935184 Change-Id: Ib648f30ce4b5d6c96f11465836d6fee89bec1c72
-rw-r--r--security/selinux/hooks.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index a4ecefc58ea2..bc19b8bc0c89 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -419,8 +419,11 @@ static int sb_finish_set_opts(struct super_block *sb)
sbsec->behavior > ARRAY_SIZE(labeling_behaviors))
sbsec->flags &= ~SE_SBLABELSUPP;
- /* Special handling for sysfs. Is genfs but also has setxattr handler*/
- if (strncmp(sb->s_type->name, "sysfs", sizeof("sysfs")) == 0)
+ /* Special handling. Is genfs but also has in-core setxattr handler*/
+ if (!strcmp(sb->s_type->name, "sysfs") ||
+ !strcmp(sb->s_type->name, "pstore") ||
+ !strcmp(sb->s_type->name, "debugfs") ||
+ !strcmp(sb->s_type->name, "rootfs"))
sbsec->flags |= SE_SBLABELSUPP;
/* Initialize the root inode. */