From c2ef2aabe251180e510b6b30fc768ade17c19f18 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Mon, 29 Jan 2018 14:13:54 -0500 Subject: [PATCH] ima-evm-utils: sysfs pathname change Commit 313d21e "tpm: device class for tpm" moved the TPM sysfs location from /sys/class/misc/tpmX/device/ to /sys/class/tpm/tpmX/device/. Mimi Zohar --- src/evmctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/evmctl.c b/src/evmctl.c index 053af43..ba63654 100644 --- a/src/evmctl.c +++ b/src/evmctl.c @@ -1265,7 +1265,8 @@ static int cmd_ima_clear(struct command *cmd) return do_cmd(cmd, ima_clear); } -static char *pcrs = "/sys/class/misc/tpm0/device/pcrs"; +static char *pcrs = "/sys/class/tpm/tpm0/device/pcrs"; /* Kernels >= 4.0 */ +static char *misc_pcrs = "/sys/class/misc/tpm0/device/pcrs"; static int tpm_pcr_read(int idx, uint8_t *pcr, int len) { @@ -1276,8 +1277,11 @@ static int tpm_pcr_read(int idx, uint8_t *pcr, int len) sprintf(pcr_str, "PCR-%d", idx); fp = fopen(pcrs, "r"); + if (!fp) + fp = fopen(misc_pcrs, "r"); + if (!fp) { - log_err("Unable to open %s\n", pcrs); + log_err("Unable to open %s or %s\n", pcrs, misc_pcrs); return -1; }