Skip to content

Commit

Permalink
IMA: handle comments in policy
Browse files Browse the repository at this point in the history
IMA policy load parser will reject any policies with a comment.  This patch
will allow the parser to just ignore lines which start with a #.  This is not
very robust.  # can ONLY be used at the very beginning of a line.  Inline
comments are not allowed.

Signed-off-by: Eric Paris
Acked-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
Eric Paris authored and James Morris committed Apr 20, 2010
1 parent 28ef400 commit 7233e3e
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions security/integrity/ima/ima_policy.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,19 +445,26 @@ ssize_t ima_parse_add_rule(char *rule)

p = strsep(&rule, "\n");
len = strlen(p) + 1;

if (*p == '#') {
kfree(entry);
return len;
}

result = ima_parse_rule(p, entry);
if (!result) {
result = len;
mutex_lock(&ima_measure_mutex);
list_add_tail(&entry->list, &measure_policy_rules);
mutex_unlock(&ima_measure_mutex);
} else {
if (result) {
kfree(entry);
integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL,
NULL, op, "invalid policy", result,
audit_info);
return result;
}
return result;

mutex_lock(&ima_measure_mutex);
list_add_tail(&entry->list, &measure_policy_rules);
mutex_unlock(&ima_measure_mutex);

return len;
}

/* ima_delete_rules called to cleanup invalid policy */
Expand Down

0 comments on commit 7233e3e

Please sign in to comment.