ima: no need to allocate entry for comment
authorDmitry Kasatkin <d.kasatkin@samsung.com>
Fri, 3 Oct 2014 11:40:19 +0000 (14:40 +0300)
committerMimi Zohar <zohar@linux.vnet.ibm.com>
Sun, 12 Oct 2014 03:28:07 +0000 (23:28 -0400)
If a rule is a comment, there is no need to allocate an entry.
Move the checking for comments before allocating the entry.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
security/integrity/ima/ima_policy.c

index cdc620b2152f9431ddd9e73e651ecc4587802939..bf232b98011e7cd12b8874f5ff3ccbfbf8c2fc13 100644 (file)
@@ -694,6 +694,12 @@ ssize_t ima_parse_add_rule(char *rule)
                return -EACCES;
        }
 
+       p = strsep(&rule, "\n");
+       len = strlen(p) + 1;
+
+       if (*p == '#')
+               return len;
+
        entry = kzalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry) {
                integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL,
@@ -703,14 +709,6 @@ ssize_t ima_parse_add_rule(char *rule)
 
        INIT_LIST_HEAD(&entry->list);
 
-       p = strsep(&rule, "\n");
-       len = strlen(p) + 1;
-
-       if (*p == '#') {
-               kfree(entry);
-               return len;
-       }
-
        result = ima_parse_rule(p, entry);
        if (result) {
                kfree(entry);