diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-01-07 09:27:15 -0800 |
|---|---|---|
| committer | Brett Rogers <brettrogers11@gmail.com> | 2015-11-07 23:25:54 -0800 |
| commit | 55691faf59c5d1ffaef46049ea295236cc134720 (patch) | |
| tree | 7233691e2af41064b23c285d12ab494586d0ac77 /security | |
| parent | e2e56e2929bbd0639eb3d5c2e427be708e8a40e4 (diff) | |
| download | kernel_samsung_smdk4412-55691faf59c5d1ffaef46049ea295236cc134720.tar.gz kernel_samsung_smdk4412-55691faf59c5d1ffaef46049ea295236cc134720.tar.bz2 kernel_samsung_smdk4412-55691faf59c5d1ffaef46049ea295236cc134720.zip | |
pstore: selinux: add security in-core xattr support for pstore and debugfs
- add "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
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index c9e28e1eb4f..bc19b8bc0c8 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -419,15 +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) - sbsec->flags |= SE_SBLABELSUPP; - - /* - * 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) + /* 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. */ |