summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kasatkin <d.kasatkin@samsung.com>2014-10-03 14:40:20 +0300
committerMimi Zohar <zohar@linux.vnet.ibm.com>2014-10-11 23:29:19 -0400
commit7178784f0a94e2e6c668f587665fde41d405a23c (patch)
tree446106018f0d880b1e2dd3da0124bb3cfc03f5c3
parent272a6e90ffee1dea39efd6fdf9592edc83a0738e (diff)
ima: ignore empty and with whitespaces policy lines
Empty policy lines cause parsing failures which is, especially for new users, hard to spot. This patch prevents it. Changes in v2: * strip leading blanks and tabs in rules to prevent parsing failures Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
-rw-r--r--security/integrity/ima/ima_policy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index bf232b98011e..d2c47d4df7b7 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -696,8 +696,9 @@ ssize_t ima_parse_add_rule(char *rule)
p = strsep(&rule, "\n");
len = strlen(p) + 1;
+ p += strspn(p, " \t");
- if (*p == '#')
+ if (*p == '#' || *p == '\0')
return len;
entry = kzalloc(sizeof(*entry), GFP_KERNEL);