ima: Calculate and extend PCR with digests in ima_template_entry
authorRoberto Sassu <roberto.sassu@huawei.com>
Wed, 25 Mar 2020 10:53:50 +0000 (11:53 +0100)
committerMimi Zohar <zohar@linux.ibm.com>
Mon, 20 Apr 2020 02:03:39 +0000 (22:03 -0400)
commit1ea973df6e2166d1a576cabe5d08925d3261ff9d
tree7e17b50d0a5cb7c630bd404c4a51727042f71438
parent6d94809af6b0830c4dfcad661535a5939bcb8a7d
ima: Calculate and extend PCR with digests in ima_template_entry

This patch modifies ima_calc_field_array_hash() to calculate a template
digest for each allocated PCR bank and SHA1. It also passes the tpm_digest
array of the template entry to ima_pcr_extend() or in case of a violation,
the pre-initialized digests array filled with 0xff.

Padding with zeros is still done if the mapping between TPM algorithm ID
and crypto ID is unknown.

This patch calculates again the template digest when a measurement list is
restored. Copying only the SHA1 digest (due to the limitation of the
current measurement list format) is not sufficient, as hash collision
detection will be done on the digest calculated with the IMA default hash
algorithm.

Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
security/integrity/ima/ima_crypto.c
security/integrity/ima/ima_queue.c
security/integrity/ima/ima_template.c