| Message ID | 20200723193329.24144-1-stephen.smalley.work@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,ima-evm-utils] extend ima_measurement --pcrs option to support per-bank pcr files | expand |
On Thu, 2020-07-23 at 15:33 -0400, Stephen Smalley wrote: > Extend the ima_measurement --pcrs option to support per-bank pcr files. > The extended syntax is "--pcrs algorithm,pathname". If no algorithm > is specified, it defaults to sha1 as before. Multiple --pcrs options > are now supported, one per bank of PCRs. The file format remains > unchanged. > > Create per-bank pcr files, depends on "tpm: add sysfs exports for all > banks of PCR registers" kernel patch: > $ cat tpm2pcrread.sh > #!/bin/sh > for alg in sha1 sha256 > do > rm -f pcr-$alg > pcr=0; > while [ $pcr -lt 24 ]; > do > printf "PCR-%02d: " $pcr >> pcr-$alg; > cat /sys/class/tpm/tpm0/pcr-$alg/$pcr >> pcr-$alg; > pcr=$[$pcr+1]; > done > done > $ sh ./tpm2pcrread.sh > > Pass only the sha1 PCRs to evmctl defaulting to sha1: > $ sudo evmctl ima_measurement --pcrs pcr-sha1 /sys/kernel/security/integrity/ima/binary_runtime_measurements --validate > > Pass only the sha1 PCRs to evmctl with explicit selection of sha1: > $ sudo evmctl ima_measurement --pcrs sha1,pcr-sha1 /sys/kernel/security/integrity/ima/binary_runtime_measurements --validate > > Pass both sha1 and sha2 PCRs to evmctl: > $ sudo evmctl ima_measurement --pcrs sha1,pcr-sha1 --pcrs sha256,pcr-sha256 /sys/kernel/security/integrity/ima/binary_runtime_measurements --validate > > NB The file parser could be improved to be more robust but I left the > existing code unchanged from the code to read the TPM 1.2 sysfs file other > than generalizing it to support loading other banks. Agreed. As a separate patch, please feel free to update the file parser. > > NB The error handling is IMHO wrong; if any error occurs during handling of > the --pcrs option(s), evmctl will try to fall back to reading the PCRs in > some other way. I think these should be fatal errors but left it as it > was for the TPM 1.2 sysfs file. > > Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com> Thank you. <snip> > @@ -1829,16 +1783,100 @@ static void extend_tpm_banks(struct template_entry *entry, int num_banks, > #endif > } > > -/* Read TPM 1.2 PCRs */ > +static int read_one_bank(struct tpm_bank_info *tpm_bank, FILE *fp) > +{ > + char *p, pcr_str[8], buf[80]; > + int i = 0; > + int result = -1; > + for (;;) { > + p = fgets(buf, sizeof(buf), fp); > + if (!p || i > 99) > + break; > + sprintf(pcr_str, "PCR-%2.2d", i); > + if (!strncmp(p, pcr_str, 6)) > + hex2bin(tpm_bank->pcr[i++], p + 7, tpm_bank->digest_size); > + result = 0; > + } > + return result; > +} > + > +static char *pcrs = "/sys/class/tpm/tpm0/device/pcrs"; /* Kernels >= 4.0 */ > +static char *misc_pcrs = "/sys/class/misc/tpm0/device/pcrs"; > + > +/* Read all of the TPM PCRs */ > static int read_tpm_pcrs(int num_banks, struct tpm_bank_info *tpm_banks) > { > - int i; > + struct stat s; > + FILE *fp = NULL; > + char *p; > + const char *alg, *path; > + int i = 0, j; > + int bank, result; > + > + /* Use the provided TPM bank pcr file(s) */ > + if (npcrfile) { > + for (i = 0; i < num_banks; i++) > + tpm_banks[i].supported = 0; > + for (i = 0; i < npcrfile; i++) { > + p = strchr(pcrfile[i], ','); > + if (p) { > + *p = 0; > + alg = pcrfile[i]; > + path = ++p; > + } else { > + alg = "sha1"; > + path = pcrfile[i]; > + } > > - if (tpm_pcr_read(tpm_banks, SHA_DIGEST_LENGTH)) { > - log_debug("Failed to read TPM 1.2 PCRs.\n"); > - return -1; > + bank = -1; > + for (j = 0; j < num_banks; j++) { > + if (!strcmp(tpm_banks[j].algo_name, alg)) { > + bank = j; > + break; > + } > + } > + if (bank < 0) { > + log_err("Unknown algorithm '%s'\n", alg); > + return -1; > + } > + > + if (stat(path, &s) == -1) { > + log_err("Could not stat '%s'\n", path); > + return -1; > + } > + > + if (!S_ISREG(s.st_mode)) { > + log_err("TPM PCR file: not a regular file or link to regular file\n"); > + return -1; > + } > + > + fp = fopen(path, "r"); > + if (!fp) { > + log_err("Could not open '%s'\n", path); > + return -1; > + } > + > + result = read_one_bank(&tpm_banks[bank], fp); > + fclose(fp); > + if (result < 0) > + return result; > + tpm_banks[bank].supported = 1; > + } > + > + return 0; > } Previously on failure to read the --pcrs TPM 1.2 file, it attempted to then read the TPM 1.2 sysfs file. Changing it like this is fine. I agree with NB 2 - either read the PCR files or the TPM PCRs directly, not both. Perhaps make that a separate patch either before or after this one. I appreciate your limiting the changes to simplify review. With reading either the PCR files or the sysfs files, can we get rid of the npcrfile indentation above? if (!npcrfile) read_sysfs_pcrs() Mimi > + /* Read the TPM 1.2 sysfs file */ > + fp = fopen(pcrs, "r"); > + if (!fp) > + fp = fopen(misc_pcrs, "r"); > + if (!fp) > + return -1; > + > + result = read_one_bank(&tpm_banks[0], fp); > + fclose(fp); > + if (result < 0) > + return result; > tpm_banks[0].supported = 1; > for (i = 1; i < num_banks; i++) > tpm_banks[i].supported = 0;
diff --git a/src/evmctl.c b/src/evmctl.c index faddc3c..fcb97a0 100644 --- a/src/evmctl.c +++ b/src/evmctl.c @@ -160,7 +160,10 @@ struct tpm_bank_info { uint8_t pcr[NUM_PCRS][MAX_DIGEST_SIZE]; }; -static char *pcrfile; + +#define MAX_PCRFILE 16 +static char *pcrfile[MAX_PCRFILE]; +static unsigned npcrfile; static int bin2file(const char *file, const char *ext, const unsigned char *data, int len) { @@ -1373,55 +1376,6 @@ static int cmd_ima_clear(struct command *cmd) return do_cmd(cmd, ima_clear); } -static char *pcrs = "/sys/class/tpm/tpm0/device/pcrs"; /* Kernels >= 4.0 */ -static char *misc_pcrs = "/sys/class/misc/tpm0/device/pcrs"; - -/* Read all of the TPM 1.2 PCRs */ -static int tpm_pcr_read(struct tpm_bank_info *tpm_banks, int len) -{ - struct stat s; - FILE *fp = NULL; - char *p, pcr_str[8], buf[70]; /* length of the TPM string */ - int result = -1; - int i = 0; - - /* Use the provided TPM 1.2 pcrs file */ - if (pcrfile) { - if (stat(pcrfile, &s) == -1) { - errno = 0; - return 1; - } - - if (!S_ISREG(s.st_mode)) { - log_info("TPM 1.2 PCR file: not a regular file or link to regular file\n"); - return 1; - } - - fp = fopen(pcrfile, "r"); - } - - if (!fp) - fp = fopen(pcrs, "r"); - - if (!fp) - fp = fopen(misc_pcrs, "r"); - - if (!fp) - return -1; - - for (;;) { - p = fgets(buf, sizeof(buf), fp); - if (!p || i > 99) - break; - sprintf(pcr_str, "PCR-%2.2d", i); - if (!strncmp(p, pcr_str, 6)) - hex2bin(tpm_banks[0].pcr[i++], p + 7, len); - result = 0; - } - fclose(fp); - return result; -} - #define TCG_EVENT_NAME_LEN_MAX 255 struct template_entry { @@ -1829,16 +1783,100 @@ static void extend_tpm_banks(struct template_entry *entry, int num_banks, #endif } -/* Read TPM 1.2 PCRs */ +static int read_one_bank(struct tpm_bank_info *tpm_bank, FILE *fp) +{ + char *p, pcr_str[8], buf[80]; + int i = 0; + int result = -1; + for (;;) { + p = fgets(buf, sizeof(buf), fp); + if (!p || i > 99) + break; + sprintf(pcr_str, "PCR-%2.2d", i); + if (!strncmp(p, pcr_str, 6)) + hex2bin(tpm_bank->pcr[i++], p + 7, tpm_bank->digest_size); + result = 0; + } + return result; +} + +static char *pcrs = "/sys/class/tpm/tpm0/device/pcrs"; /* Kernels >= 4.0 */ +static char *misc_pcrs = "/sys/class/misc/tpm0/device/pcrs"; + +/* Read all of the TPM PCRs */ static int read_tpm_pcrs(int num_banks, struct tpm_bank_info *tpm_banks) { - int i; + struct stat s; + FILE *fp = NULL; + char *p; + const char *alg, *path; + int i = 0, j; + int bank, result; + + /* Use the provided TPM bank pcr file(s) */ + if (npcrfile) { + for (i = 0; i < num_banks; i++) + tpm_banks[i].supported = 0; + for (i = 0; i < npcrfile; i++) { + p = strchr(pcrfile[i], ','); + if (p) { + *p = 0; + alg = pcrfile[i]; + path = ++p; + } else { + alg = "sha1"; + path = pcrfile[i]; + } - if (tpm_pcr_read(tpm_banks, SHA_DIGEST_LENGTH)) { - log_debug("Failed to read TPM 1.2 PCRs.\n"); - return -1; + bank = -1; + for (j = 0; j < num_banks; j++) { + if (!strcmp(tpm_banks[j].algo_name, alg)) { + bank = j; + break; + } + } + if (bank < 0) { + log_err("Unknown algorithm '%s'\n", alg); + return -1; + } + + if (stat(path, &s) == -1) { + log_err("Could not stat '%s'\n", path); + return -1; + } + + if (!S_ISREG(s.st_mode)) { + log_err("TPM PCR file: not a regular file or link to regular file\n"); + return -1; + } + + fp = fopen(path, "r"); + if (!fp) { + log_err("Could not open '%s'\n", path); + return -1; + } + + result = read_one_bank(&tpm_banks[bank], fp); + fclose(fp); + if (result < 0) + return result; + tpm_banks[bank].supported = 1; + } + + return 0; } + /* Read the TPM 1.2 sysfs file */ + fp = fopen(pcrs, "r"); + if (!fp) + fp = fopen(misc_pcrs, "r"); + if (!fp) + return -1; + + result = read_one_bank(&tpm_banks[0], fp); + fclose(fp); + if (result < 0) + return result; tpm_banks[0].supported = 1; for (i = 1; i < num_banks; i++) tpm_banks[i].supported = 0; @@ -1857,7 +1895,7 @@ static int read_tpm_banks(int num_banks, struct tpm_bank_info *bank) int i, j; int err; - /* First try reading PCRs from exported TPM 1.2 sysfs file */ + /* First try reading PCRs from TPM pcr file(s) */ if (read_tpm_pcrs(num_banks, bank) == 0) return 0; @@ -2667,7 +2705,11 @@ int main(int argc, char *argv[]) verify = 1; break; case 143: - pcrfile = optarg; + if (npcrfile >= MAX_PCRFILE) { + log_err("too many --pcrfile options\n"); + exit(1); + } + pcrfile[npcrfile++] = optarg; break; case '?': exit(1); diff --git a/src/imaevm.h b/src/imaevm.h index 3f1db97..4503919 100644 --- a/src/imaevm.h +++ b/src/imaevm.h @@ -203,7 +203,7 @@ struct RSA_ASN1_template { size_t size; }; -#define NUM_PCRS 20 +#define NUM_PCRS 24 #define DEFAULT_PCR 10 extern struct libimaevm_params imaevm_params;
Extend the ima_measurement --pcrs option to support per-bank pcr files. The extended syntax is "--pcrs algorithm,pathname". If no algorithm is specified, it defaults to sha1 as before. Multiple --pcrs options are now supported, one per bank of PCRs. The file format remains unchanged. Create per-bank pcr files, depends on "tpm: add sysfs exports for all banks of PCR registers" kernel patch: $ cat tpm2pcrread.sh #!/bin/sh for alg in sha1 sha256 do rm -f pcr-$alg pcr=0; while [ $pcr -lt 24 ]; do printf "PCR-%02d: " $pcr >> pcr-$alg; cat /sys/class/tpm/tpm0/pcr-$alg/$pcr >> pcr-$alg; pcr=$[$pcr+1]; done done $ sh ./tpm2pcrread.sh Pass only the sha1 PCRs to evmctl defaulting to sha1: $ sudo evmctl ima_measurement --pcrs pcr-sha1 /sys/kernel/security/integrity/ima/binary_runtime_measurements --validate Pass only the sha1 PCRs to evmctl with explicit selection of sha1: $ sudo evmctl ima_measurement --pcrs sha1,pcr-sha1 /sys/kernel/security/integrity/ima/binary_runtime_measurements --validate Pass both sha1 and sha2 PCRs to evmctl: $ sudo evmctl ima_measurement --pcrs sha1,pcr-sha1 --pcrs sha256,pcr-sha256 /sys/kernel/security/integrity/ima/binary_runtime_measurements --validate NB The file parser could be improved to be more robust but I left the existing code unchanged from the code to read the TPM 1.2 sysfs file other than generalizing it to support loading other banks. NB The error handling is IMHO wrong; if any error occurs during handling of the --pcrs option(s), evmctl will try to fall back to reading the PCRs in some other way. I think these should be fatal errors but left it as it was for the TPM 1.2 sysfs file. Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com> --- v2 fixes the buf size to be large enough for sha256 hex string plus the PCR-NN: prefix; otherwise it was truncating. src/evmctl.c | 156 ++++++++++++++++++++++++++++++++------------------- src/imaevm.h | 2 +- 2 files changed, 100 insertions(+), 58 deletions(-)