From 8c8f29e870bf8274ba7ef4c619e6ec67195c5331 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Tue, 26 Jun 2018 10:27:18 -0600 Subject: [PATCH] ima-evm-utils: check the return code from tpm_pcr_read() in ima_measurement() Don't log garbage when neither /sys/class/tpm/tpm0/device/pcrs nor /sys/class/misc/tpm0/device/pcrs can be read and exit nicely with a value of 1. Signed-off-by: George Wilson Signed-off-by: Mimi Zohar --- src/evmctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/evmctl.c b/src/evmctl.c index 9ef2031..1b46d58 100644 --- a/src/evmctl.c +++ b/src/evmctl.c @@ -1535,7 +1535,8 @@ static int ima_measurement(const char *file) log_info("PCRAgg %.2d: ", i); log_dump(pcr[i], SHA_DIGEST_LENGTH); - tpm_pcr_read(i, hwpcr, sizeof(hwpcr)); + if (tpm_pcr_read(i, hwpcr, sizeof(hwpcr))) + exit(1); log_info("HW PCR-%d: ", i); log_dump(hwpcr, sizeof(hwpcr));