Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ima: return an error code from ima_add_boot_aggregate()

Browse source 
This patch modifies ima_add_boot_aggregate() to return an error code.
This way we can determine if all the initialization procedures have
been executed successfully.

Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
This commit is contained in:
Roberto Sassu 2014-09-12 19:35:53 +02:00 committed by Mimi Zohar
parent 2faa6ef3b2
commit be39ffc2fe
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
security/integrity/ima/ima_init.c
View file

@ -43,7 +43,7 @@ int ima_used_chip;
* a different value.) Violations add a zero entry to the measurement * a different value.) Violations add a zero entry to the measurement
* list and extend the aggregate PCR value with ff...ff's. * list and extend the aggregate PCR value with ff...ff's.
*/ */
static void __init ima_add_boot_aggregate(void) static int __init ima_add_boot_aggregate(void)
{ {
static const char op[] = "add_boot_aggregate"; static const char op[] = "add_boot_aggregate";
const char *audit_cause = "ENOMEM"; const char *audit_cause = "ENOMEM";
@ -72,17 +72,23 @@ static void __init ima_add_boot_aggregate(void)
result = ima_alloc_init_template(iint, NULL, boot_aggregate_name, result = ima_alloc_init_template(iint, NULL, boot_aggregate_name,
NULL, 0, &entry); NULL, 0, &entry);
if (result < 0) if (result < 0) {
return; audit_cause = "alloc_entry";
goto err_out;
}
result = ima_store_template(entry, violation, NULL, result = ima_store_template(entry, violation, NULL,
boot_aggregate_name); boot_aggregate_name);
if (result < 0) if (result < 0) {
ima_free_template_entry(entry); ima_free_template_entry(entry);
return; audit_cause = "store_entry";
goto err_out;
}
return 0;
err_out: err_out:
integrity_audit_msg(AUDIT_INTEGRITY_PCR, NULL, boot_aggregate_name, op, integrity_audit_msg(AUDIT_INTEGRITY_PCR, NULL, boot_aggregate_name, op,
audit_cause, result, 0); audit_cause, result, 0);
return result;
} }
int __init ima_init(void) int __init ima_init(void)
@ -109,7 +115,10 @@ int __init ima_init(void)
if (rc != 0) if (rc != 0)
return rc; return rc;
ima_add_boot_aggregate(); /* boot aggregate must be first entry */ rc = ima_add_boot_aggregate(); /* boot aggregate must be first entry */
if (rc != 0)
return rc;
ima_init_policy(); ima_init_policy();
return ima_fs_init(); return ima_fs_init();