summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_init.c
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2013-07-23 11:15:00 -0400
committerMimi Zohar <zohar@linux.vnet.ibm.com>2013-10-31 20:19:35 -0400
commitbcbc9b0cf6d8f340a1d166e414f4612b353f7a9b (patch)
treecd728f166ccf86137a7a8a7847ce962488ff86e2 /security/integrity/ima/ima_init.c
parent42a20ba5c90ded07f79992d222fa0814b8448cf6 (diff)
downloadlinux-stable-bcbc9b0cf6d8f340a1d166e414f4612b353f7a9b.tar.gz
linux-stable-bcbc9b0cf6d8f340a1d166e414f4612b353f7a9b.tar.bz2
linux-stable-bcbc9b0cf6d8f340a1d166e414f4612b353f7a9b.zip
ima: extend the measurement list to include the file signature
This patch defines a new template called 'ima-sig', which includes the file signature in the template data, in addition to the file's digest and pathname. A template is composed of a set of fields. Associated with each field is an initialization and display function. This patch defines a new template field called 'sig', the initialization function ima_eventsig_init(), and the display function ima_show_template_sig(). This patch modifies the .field_init() function definition to include the 'security.ima' extended attribute and length. Changelog: - remove unused code (Dmitry Kasatkin) - avoid calling ima_write_template_field_data() unnecesarily (Roberto Sassu) - rename DATA_FMT_SIG to DATA_FMT_HEX - cleanup ima_eventsig_init() based on Roberto's comments Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
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 f84aec5412f3..15f34bd40abe 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -69,7 +69,7 @@ static void __init ima_add_boot_aggregate(void)
}
result = ima_alloc_init_template(iint, NULL, boot_aggregate_name,
- &entry);
+ NULL, 0, &entry);
if (result < 0)
return;