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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:05:26 +0000 (09:05 +0200)
commitfcb067cb457e2326c6d759e346f5f5dfef351d50
tree2f1cbea9ff6714c126e2745a1bdf3efe45f0533a
parent789555b22ba2e62fd197a17be075ec8314d0c0b2
ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()

[ Upstream commit 6cc7c266e5b47d3cd2b5bb7fd3aac4e6bb2dd1d2 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
security/integrity/ima/ima.h
security/integrity/ima/ima_crypto.c
security/integrity/ima/ima_init.c
security/integrity/ima/ima_template_lib.c