aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_policy.c
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2012-12-13 11:15:04 -0500
committerMimi Zohar <zohar@linux.vnet.ibm.com>2013-01-16 17:49:59 -0500
commit16cac49f727621c6b0467ffe15ed72c2febb1296 (patch)
treedc9b4914116ad2ecb1831184192470900e609a27 /security/integrity/ima/ima_policy.c
parentb51524635b73cfa27cc393859b277cee9c042820 (diff)
ima: rename FILE_MMAP to MMAP_CHECK
Rename FILE_MMAP hook to MMAP_CHECK to be consistent with the other hook names. Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_policy.c')
-rw-r--r--security/integrity/ima/ima_policy.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index 70f888de880d..95194539d75e 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -75,7 +75,7 @@ static struct ima_rule_entry default_rules[] = {
75 {.action = DONT_MEASURE,.fsmagic = BINFMTFS_MAGIC,.flags = IMA_FSMAGIC}, 75 {.action = DONT_MEASURE,.fsmagic = BINFMTFS_MAGIC,.flags = IMA_FSMAGIC},
76 {.action = DONT_MEASURE,.fsmagic = SECURITYFS_MAGIC,.flags = IMA_FSMAGIC}, 76 {.action = DONT_MEASURE,.fsmagic = SECURITYFS_MAGIC,.flags = IMA_FSMAGIC},
77 {.action = DONT_MEASURE,.fsmagic = SELINUX_MAGIC,.flags = IMA_FSMAGIC}, 77 {.action = DONT_MEASURE,.fsmagic = SELINUX_MAGIC,.flags = IMA_FSMAGIC},
78 {.action = MEASURE,.func = FILE_MMAP,.mask = MAY_EXEC, 78 {.action = MEASURE,.func = MMAP_CHECK,.mask = MAY_EXEC,
79 .flags = IMA_FUNC | IMA_MASK}, 79 .flags = IMA_FUNC | IMA_MASK},
80 {.action = MEASURE,.func = BPRM_CHECK,.mask = MAY_EXEC, 80 {.action = MEASURE,.func = BPRM_CHECK,.mask = MAY_EXEC,
81 .flags = IMA_FUNC | IMA_MASK}, 81 .flags = IMA_FUNC | IMA_MASK},
@@ -448,8 +448,9 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
448 entry->func = FILE_CHECK; 448 entry->func = FILE_CHECK;
449 else if (strcmp(args[0].from, "MODULE_CHECK") == 0) 449 else if (strcmp(args[0].from, "MODULE_CHECK") == 0)
450 entry->func = MODULE_CHECK; 450 entry->func = MODULE_CHECK;
451 else if (strcmp(args[0].from, "FILE_MMAP") == 0) 451 else if ((strcmp(args[0].from, "FILE_MMAP") == 0)
452 entry->func = FILE_MMAP; 452 || (strcmp(args[0].from, "MMAP_CHECK") == 0))
453 entry->func = MMAP_CHECK;
453 else if (strcmp(args[0].from, "BPRM_CHECK") == 0) 454 else if (strcmp(args[0].from, "BPRM_CHECK") == 0)
454 entry->func = BPRM_CHECK; 455 entry->func = BPRM_CHECK;
455 else 456 else