summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_init.c
diff options
context:
space:
mode:
authorRoberto Sassu2015-04-11 17:12:39 +0200
committerMimi Zohar2015-05-21 19:59:29 +0200
commit8d94eb9b5cff350ba170848c862ca0006d33d496 (patch)
tree88774fba38e58df1530470b3a5072e5b729f2ec6 /security/integrity/ima/ima_init.c
parentima: wrap event related data to the new ima_event_data structure (diff)
downloadkernel-qcow2-linux-8d94eb9b5cff350ba170848c862ca0006d33d496.tar.gz
kernel-qcow2-linux-8d94eb9b5cff350ba170848c862ca0006d33d496.tar.xz
kernel-qcow2-linux-8d94eb9b5cff350ba170848c862ca0006d33d496.zip
ima: pass iint to ima_add_violation()
This patch adds the iint associated to the current inode as a new parameter of ima_add_violation(). The passed iint is always not NULL if a violation is detected. This modification will be used to determine the inode for which there is a violation. Since the 'd' and 'd-ng' template field init() functions were detecting a violation from the value of the iint pointer, they now check the new field 'violation', added to the 'ima_event_data' structure. Changelog: - v1: - modified an old comment (Roberto Sassu) Signed-off-by: Roberto Sassu <rsassu@suse.de> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_init.c')
-rw-r--r--security/integrity/ima/ima_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index 2c668370a438..e600cadd231c 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -50,7 +50,7 @@ static int __init ima_add_boot_aggregate(void)
struct ima_template_entry *entry;
struct integrity_iint_cache tmp_iint, *iint = &tmp_iint;
struct ima_event_data event_data = {iint, NULL, boot_aggregate_name,
- NULL, 0};
+ NULL, 0, NULL};
int result = -ENOMEM;
int violation = 0;
struct {