diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-04-21 16:54:24 -0400 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-05-21 13:28:41 -0400 |
commit | cd025f7f94108995383edddfb61fc8afea6c66a9 (patch) | |
tree | 628c70ef33b853ffab7de16d855de5adf1be9d8c /security/integrity | |
parent | 6438de9f3fb5180d78a0422695d0b88c687757d3 (diff) |
ima: do not measure or appraise the NSFS filesystem
Include don't appraise or measure rules for the NSFS filesystem
in the builtin ima_tcb and ima_appraise_tcb policies.
Changelog:
- Update documentation
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org # 3.19
Diffstat (limited to 'security/integrity')
-rw-r--r-- | security/integrity/ima/ima_policy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index e4244fc43cf1..f2421f7fa3c8 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c | |||
@@ -81,6 +81,7 @@ static struct ima_rule_entry default_rules[] = { | |||
81 | {.action = DONT_MEASURE, .fsmagic = SELINUX_MAGIC, .flags = IMA_FSMAGIC}, | 81 | {.action = DONT_MEASURE, .fsmagic = SELINUX_MAGIC, .flags = IMA_FSMAGIC}, |
82 | {.action = DONT_MEASURE, .fsmagic = CGROUP_SUPER_MAGIC, | 82 | {.action = DONT_MEASURE, .fsmagic = CGROUP_SUPER_MAGIC, |
83 | .flags = IMA_FSMAGIC}, | 83 | .flags = IMA_FSMAGIC}, |
84 | {.action = DONT_MEASURE, .fsmagic = NSFS_MAGIC, .flags = IMA_FSMAGIC}, | ||
84 | {.action = MEASURE, .func = MMAP_CHECK, .mask = MAY_EXEC, | 85 | {.action = MEASURE, .func = MMAP_CHECK, .mask = MAY_EXEC, |
85 | .flags = IMA_FUNC | IMA_MASK}, | 86 | .flags = IMA_FUNC | IMA_MASK}, |
86 | {.action = MEASURE, .func = BPRM_CHECK, .mask = MAY_EXEC, | 87 | {.action = MEASURE, .func = BPRM_CHECK, .mask = MAY_EXEC, |
@@ -101,6 +102,7 @@ static struct ima_rule_entry default_appraise_rules[] = { | |||
101 | {.action = DONT_APPRAISE, .fsmagic = BINFMTFS_MAGIC, .flags = IMA_FSMAGIC}, | 102 | {.action = DONT_APPRAISE, .fsmagic = BINFMTFS_MAGIC, .flags = IMA_FSMAGIC}, |
102 | {.action = DONT_APPRAISE, .fsmagic = SECURITYFS_MAGIC, .flags = IMA_FSMAGIC}, | 103 | {.action = DONT_APPRAISE, .fsmagic = SECURITYFS_MAGIC, .flags = IMA_FSMAGIC}, |
103 | {.action = DONT_APPRAISE, .fsmagic = SELINUX_MAGIC, .flags = IMA_FSMAGIC}, | 104 | {.action = DONT_APPRAISE, .fsmagic = SELINUX_MAGIC, .flags = IMA_FSMAGIC}, |
105 | {.action = DONT_APPRAISE, .fsmagic = NSFS_MAGIC, .flags = IMA_FSMAGIC}, | ||
104 | {.action = DONT_APPRAISE, .fsmagic = CGROUP_SUPER_MAGIC, .flags = IMA_FSMAGIC}, | 106 | {.action = DONT_APPRAISE, .fsmagic = CGROUP_SUPER_MAGIC, .flags = IMA_FSMAGIC}, |
105 | #ifndef CONFIG_IMA_APPRAISE_SIGNED_INIT | 107 | #ifndef CONFIG_IMA_APPRAISE_SIGNED_INIT |
106 | {.action = APPRAISE, .fowner = GLOBAL_ROOT_UID, .flags = IMA_FOWNER}, | 108 | {.action = APPRAISE, .fowner = GLOBAL_ROOT_UID, .flags = IMA_FOWNER}, |