dh/ima-evm-utils-mirror
1
0
Fork 0
mirror of https://git.code.sf.net/p/linux-ima/ima-evm-utils synced 2025-04-28 14:43:37 +02:00
Code Releases Activity

ima-evm-utils: address new compiler complaints

Browse Source 
Address the new compiler complaints:
- while reading the template data
- while reading the exported TPM 1.2 PCRs
- while reading the TPM event log

Reported-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Mimi Zohar 2020-07-15 12:57:24 -04:00
parent 80d3fda608
commit 0911c60fb5
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/evmctl.c
View File

@ -1380,7 +1380,7 @@ static char *misc_pcrs = "/sys/class/misc/tpm0/device/pcrs";
static int tpm_pcr_read(struct tpm_bank_info *tpm_banks, int len) static int tpm_pcr_read(struct tpm_bank_info *tpm_banks, int len)
{ {
FILE *fp = NULL; FILE *fp = NULL;
char *p, pcr_str[7], buf[70]; /* length of the TPM string */ char *p, pcr_str[8], buf[70]; /* length of the TPM string */
int result = -1; int result = -1;
int i = 0; int i = 0;
@ -1399,7 +1399,7 @@ static int tpm_pcr_read(struct tpm_bank_info *tpm_banks, int len)
for (;;) { for (;;) {
p = fgets(buf, sizeof(buf), fp); p = fgets(buf, sizeof(buf), fp);
if (!p) if (!p || i > 99)
break; break;
sprintf(pcr_str, "PCR-%2.2d", i); sprintf(pcr_str, "PCR-%2.2d", i);
if (!strncmp(p, pcr_str, 6)) if (!strncmp(p, pcr_str, 6))
@ -1980,11 +1980,21 @@ static int ima_measurement(const char *file)
* in the template data hash calculation. * in the template data hash calculation.
*/ */
len = fread(&field_len, sizeof(field_len), 1, fp); len = fread(&field_len, sizeof(field_len), 1, fp);
if (field_len > TCG_EVENT_NAME_LEN_MAX) if (len <= 0) {
log_errno("Failed reading file name length\n");
goto out;
}
if (field_len > TCG_EVENT_NAME_LEN_MAX) {
log_err("file pathname is too long\n"); log_err("file pathname is too long\n");
goto out;
}
fread(entry.template + SHA_DIGEST_LENGTH, len = fread(entry.template + SHA_DIGEST_LENGTH,
field_len, 1, fp); field_len, 1, fp);
if (len != 1) {
log_errno("Failed reading file name\n");
goto out;
}
/* /*
* The template data is fixed sized, zero out * The template data is fixed sized, zero out
@ -2069,6 +2079,7 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
FILE *fp; FILE *fp;
SHA_CTX c; SHA_CTX c;
int err = 0; int err = 0;
int len;
int i; int i;
fp = fopen(file, "r"); fp = fopen(file, "r");
@ -2100,7 +2111,11 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
err = 1; err = 1;
break; break;
} }
fread(event.data, event.header.len, 1, fp); len = fread(event.data, event.header.len, 1, fp);
if (len != 1) {
log_errno("Failed reading event data (short read)\n");
break;
}
} }
fclose(fp); fclose(fp);