ima-evm-utils: address new compiler complaints
Mimi Zohar
maintainerPATCH 1/3 ima-evm-utils: address new compiler complaints
Address the new compiler complaints:
- while reading the template data
- while reading the exported TPM 1.2 PCRs
- while reading the TPM event log
--- src/evmctl.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
src/evmctl.c +21 -6
@@ -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) {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 i =0 ;
@@ -1399,7 +1399,7 @@ static int tpm_pcr_read(struct tpm_bank_info *tpm_banks, int len)for (;;) { p =fgets (buf,sizeof (buf), fp); -if (!p) +if (!p || i >99 )break ;sprintf (pcr_str,"PCR-%2.2d" , i);if (!strncmp (p, pcr_str,6 ))
@@ -1980,11 +1980,21 @@ static int ima_measurement(const char *file)* in the template data hash calculation. */ 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" ); + goto out; + } -fread (entry.template +SHA_DIGEST_LENGTH , - field_len,1 , fp); + len =fread (entry.template +SHA_DIGEST_LENGTH , + field_len,1 , fp); +if (len != field_len) { +log_errno ("Failed reading file name\n" ); + goto 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;SHA_CTX c;int err =0 ; +int len;int i; fp =fopen (file,"r" );
@@ -2100,7 +2111,11 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank) err =1 ;break ; } -fread (event.data, event.header.len,1 , fp); + len =fread (event.data, event.header.len,1 , fp); +if (len != event.header.len) { +log_errno ("Failed reading event data (short read)\n" ); +break ; + } }fclose (fp);
Signature · 1 line
2.7.5
Mimi Zohar
maintainerPATCH 2/3 ima-evm-utils: reading public keys
Not being able to read the public key is not necessarily an error. Emit a message based on log level.
--- src/libimaevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
src/libimaevm.c +2 -1
@@ -323,7 +323,8 @@ EVP_PKEY *read_pub_pkey(const char *keyfile, int x509) fp =fopen (keyfile,"r" );if (!fp) { -log_err ("Failed to open keyfile: %s\n" , keyfile); +if (imaevm_params.verbose >LOG_INFO ) +log_info ("Failed to open keyfile: %s\n" , keyfile);return NULL ; }
Signature · 1 line
2.7.5
Mimi Zohar
maintainerPATCH 3/3 ima-evm-utils: add missing license info
In reply to Mimi Zoharsrc/utils.c contains some common functions.
--- src/utils.c | 7 +++++++ 1 file changed, 7 insertions(+)
src/utils.c +7 -0
@@ -1,3 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* utils: set of common functions +* +* Copyright (C) 2020 Patrick Uiterwijk <[email protected]> +* Copyright (C) 2010 Cyril Hrubis <[email protected]> +*/ #include <stdint.h> #include <stdio.h> #include <stdlib.h>
Signature · 1 line
2.7.5
Mimi Zohar
maintainerAddress the new compiler complaints:
- while reading the template data
- while reading the exported TPM 1.2 PCRs
- while reading the TPM event log
---
Changelog v1:
- Fix fread() tests
src/evmctl.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
src/evmctl.c +21 -6
@@ -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) {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 i =0 ;
@@ -1399,7 +1399,7 @@ static int tpm_pcr_read(struct tpm_bank_info *tpm_banks, int len)for (;;) { p =fgets (buf,sizeof (buf), fp); -if (!p) +if (!p || i >99 )break ;sprintf (pcr_str,"PCR-%2.2d" , i);if (!strncmp (p, pcr_str,6 ))
@@ -1980,11 +1980,21 @@ static int ima_measurement(const char *file)* in the template data hash calculation. */ 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" ); + goto out; + } -fread (entry.template +SHA_DIGEST_LENGTH , - field_len,1 , fp); + len =fread (entry.template +SHA_DIGEST_LENGTH , + field_len,1 , fp); +if (len !=1 ) { +log_errno ("Failed reading file name\n" ); + goto 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;SHA_CTX c;int err =0 ; +int len;int i; fp =fopen (file,"r" );
@@ -2100,7 +2111,11 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank) err =1 ;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);
Signature · 1 line
2.7.5
Hi Mimi,
Quoted 11 lines
Address the new compiler complaints:
- while reading the template data
- while reading the exported TPM 1.2 PCRs
- while reading the TPM event logReported-by Petr Vorel <[email protected]>Signed-off-by Mimi Zohar <[email protected]>---
Changelog v1:- Fix
fread()tests
Again, thanks for fixing this.
Kind regards,
Petr