TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ima: show rules with IMA_INMASK correctly

Browse Source 
commit 8cdc23a3d9ec0944000ad43bad588e36afdc38cd upstream.

Show the '^' character when a policy rule has flag IMA_INMASK.

Fixes: 80eae209d6 ("IMA: allow reading back the current IMA policy")
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Roberto Sassu
2019-05-29 15:30:35 +02:00
committed by Greg Kroah-Hartman
parent 21158982f6
commit f85b87a9a2
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
security/integrity/ima/ima_policy.c
View File

@@ -1059,10 +1059,10 @@ enum {
}; };
static const char *const mask_tokens[] = { static const char *const mask_tokens[] = {
"MAY_EXEC", "^MAY_EXEC",
"MAY_WRITE", "^MAY_WRITE",
"MAY_READ", "^MAY_READ",
"MAY_APPEND" "^MAY_APPEND"
}; };
#define __ima_hook_stringify(str) (#str), #define __ima_hook_stringify(str) (#str),
@@ -1122,6 +1122,7 @@ int ima_policy_show(struct seq_file *m, void *v)
struct ima_rule_entry *entry = v; struct ima_rule_entry *entry = v;
int i; int i;
char tbuf[64] = {0,}; char tbuf[64] = {0,};
int offset = 0;
rcu_read_lock(); rcu_read_lock();
@@ -1145,15 +1146,17 @@ int ima_policy_show(struct seq_file *m, void *v)
if (entry->flags & IMA_FUNC) if (entry->flags & IMA_FUNC)
policy_func_show(m, entry->func); policy_func_show(m, entry->func);
if (entry->flags & IMA_MASK) { if ((entry->flags & IMA_MASK) || (entry->flags & IMA_INMASK)) {
if (entry->flags & IMA_MASK)
offset = 1;
if (entry->mask & MAY_EXEC) if (entry->mask & MAY_EXEC)
seq_printf(m, pt(Opt_mask), mt(mask_exec)); seq_printf(m, pt(Opt_mask), mt(mask_exec) + offset);
if (entry->mask & MAY_WRITE) if (entry->mask & MAY_WRITE)
seq_printf(m, pt(Opt_mask), mt(mask_write)); seq_printf(m, pt(Opt_mask), mt(mask_write) + offset);
if (entry->mask & MAY_READ) if (entry->mask & MAY_READ)
seq_printf(m, pt(Opt_mask), mt(mask_read)); seq_printf(m, pt(Opt_mask), mt(mask_read) + offset);
if (entry->mask & MAY_APPEND) if (entry->mask & MAY_APPEND)
seq_printf(m, pt(Opt_mask), mt(mask_append)); seq_printf(m, pt(Opt_mask), mt(mask_append) + offset);
seq_puts(m, " "); seq_puts(m, " ");
} }