OSDN Git Service

ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()
authorRoberto Sassu <roberto.sassu@huawei.com>
Wed, 3 Jun 2020 15:08:21 +0000 (17:08 +0200)
committerMimi Zohar <zohar@linux.ibm.com>
Wed, 3 Jun 2020 21:20:43 +0000 (17:20 -0400)
commit6cc7c266e5b47d3cd2b5bb7fd3aac4e6bb2dd1d2
treeb9eed46e6e7e0620802d75853502beffbef05fc8
parent067a436b1b0aafa593344fddd711a755a58afb3b
ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()

If the template field 'd' is chosen and the digest to be added to the
measurement entry was not calculated with SHA1 or MD5, it is
recalculated with SHA1, by using the passed file descriptor. However, this
cannot be done for boot_aggregate, because there is no file descriptor.

This patch adds a call to ima_calc_boot_aggregate() in
ima_eventdigest_init(), so that the digest can be recalculated also for the
boot_aggregate entry.

Cc: stable@vger.kernel.org # 3.13.x
Fixes: 3ce1217d6cd5d ("ima: define template fields library and new helpers")
Reported-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
security/integrity/ima/ima.h
security/integrity/ima/ima_crypto.c
security/integrity/ima/ima_init.c
security/integrity/ima/ima_template_lib.c