diff options
author | Roberto Sassu <roberto.sassu@huawei.com> | 2020-03-25 11:47:08 +0100 |
---|---|---|
committer | Mimi Zohar <zohar@linux.ibm.com> | 2020-04-20 04:03:39 +0200 |
commit | 7ca79645a1f8837c3850b881a2c0b43cfba5dc36 (patch) | |
tree | 77ea4f7f46f5c34fe1beb238f6f66a14f5deb20f /security/integrity/ima/ima.h | |
parent | ima: Evaluate error in init_ima() (diff) | |
download | linux-7ca79645a1f8837c3850b881a2c0b43cfba5dc36.tar.xz linux-7ca79645a1f8837c3850b881a2c0b43cfba5dc36.zip |
ima: Store template digest directly in ima_template_entry
In preparation for the patch that calculates a digest for each allocated
PCR bank, this patch passes to ima_calc_field_array_hash() the
ima_template_entry structure, so that digests can be directly stored in
that structure instead of ima_digest_data.
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima.h')
-rw-r--r-- | security/integrity/ima/ima.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 64317d95363e..a2dfe24e04c7 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -138,8 +138,7 @@ int ima_calc_file_hash(struct file *file, struct ima_digest_data *hash); int ima_calc_buffer_hash(const void *buf, loff_t len, struct ima_digest_data *hash); int ima_calc_field_array_hash(struct ima_field_data *field_data, - struct ima_template_desc *desc, int num_fields, - struct ima_digest_data *hash); + struct ima_template_entry *entry); int __init ima_calc_boot_aggregate(struct ima_digest_data *hash); void ima_add_violation(struct file *file, const unsigned char *filename, struct integrity_iint_cache *iint, |