ima-evm-utils: Fix null dereference from file2bin to memcpy
PATCH 1/5 ima-evm-utils: Fix null dereference from file2bin to memcpy
file2bin() may return NULL, which is set to tmp, which is passed to memcpy. Add explicit check for it. CID 229904.
--- src/evmctl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
src/evmctl.c +9 -1
@@ -821,7 +821,15 @@ static int verify_ima(const char *file)if (sigfile) {void *tmp =file2bin (file,"sig" , &len); -assert (len <=sizeof (sig)); +if (!tmp) { +log_err ("Failed reading: %s\n" , file); +return -1 ; + } +if (len >sizeof (sig)) { +log_err ("File is too big: %s\n" , file); +free (tmp); +return -1 ; + }memcpy (sig, tmp, len);free (tmp); }else {
Signature · 1 line
2.11.0
PATCH 2/5 ima-evm-utils: Fix possible strcpy overflow
caps_str is passed from command line but copied into fixed-size buffer. CID 229895.
--- src/evmctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
src/evmctl.c +2 -1
@@ -409,8 +409,9 @@ static int calc_evm_hash(const char *file, unsigned char *hash) }else if (!strcmp (*xattrname,XATTR_NAME_CAPS ) && (hmac_flags &HMAC_FLAG_CAPS_SET )) {if (!caps_str)continue ; -strcpy (xattr_value, caps_str); err =strlen (caps_str); +assert (err <sizeof (xattr_value)); +strcpy (xattr_value, caps_str); }else { err =lgetxattr (file, *xattrname, xattr_value,sizeof (xattr_value));if (err <0 ) {
Signature · 1 line
2.11.0
Mimi Zohar
maintainerRe: [PATCH v1 2/5] ima-evm-utils: Fix possible strcpy overflow
Quoted 11 lines · Vitaly Chikunov
caps_stris passed from command line but copied into fixed-size buffer. CID 229895.--- src/evmctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)src/evmctl.c +0
-0
src/evmctl.c static int calc_evm_hash(const char *file, unsigned char *hash) · line 413
Quoted 6 lines
src/evmctl.c +1
-1@@ -409,8 +409,9 @@ static int calc_evm_hash(const char *file, unsigned char *hash) }else if (!strcmp (*xattrname,XATTR_NAME_CAPS ) && (hmac_flags &HMAC_FLAG_CAPS_SET )) {if (!caps_str)continue ; -strcpy (xattr_value, caps_str); err =strlen (caps_str); +assert (err <sizeof (xattr_value));
"calc_evm_hash" can be called while walking and labeling, or verifying, a file system. We probably don't want to abruptly end it. Maybe emit an error message and return and error?
Quoted 4 lines
src/evmctl.c +1
-0+strcpy (xattr_value, caps_str); }else { err =lgetxattr (file, *xattrname, xattr_value,sizeof (xattr_value));if (err <0 ) {
Re: [PATCH v1 2/5] ima-evm-utils: Fix possible strcpy overflow
Quoted 7 lines · Mimi Zohar
Quoted 6 lines · Vitaly Chikunov
caps_stris passed from command line but copied into fixed-size buffer. CID 229895.--- src/evmctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 15 lines
src/evmctl.c static int calc_evm_hash(const char *file, unsigned char *hash) · line 413
Quoted 11 lines
src/evmctl.c +1
-1@@ -409,8 +409,9 @@ static int calc_evm_hash(const char *file, unsigned char *hash) }else if (!strcmp (*xattrname,XATTR_NAME_CAPS ) && (hmac_flags &HMAC_FLAG_CAPS_SET )) {if (!caps_str)continue ; -strcpy (xattr_value, caps_str); err =strlen (caps_str); +assert (err <sizeof (xattr_value));"
calc_evm_hash" can be called while walking and labeling, or verifying, a file system. We probably don't want to abruptly end it. Maybe emit an error message and return and error?
Ok. I will also add similar checks for selinux_str and ima_str.
Thanks,
Quoted 6 lines
Quoted 6 lines
src/evmctl.c +1
-0+strcpy (xattr_value, caps_str); }else { err =lgetxattr (file, *xattrname, xattr_value,sizeof (xattr_value));if (err <0 ) {
PATCH 3/5 ima-evm-utils: Fix memory leak in get_password
In reply to Vitaly ChikunovFree password buffer when return NULL.
Partially fix CID 229894.
--- src/evmctl.c | 2 ++ 1 file changed, 2 insertions(+)
src/evmctl.c +2 -0
@@ -1827,6 +1827,7 @@ static char *get_password(void)if (tcsetattr (fileno (stdin),TCSANOW , &tmp_flags) !=0 ) {perror ("tcsetattr" ); +free (password);return NULL ; }
@@ -1836,6 +1837,7 @@ static char *get_password(void)/* restore terminal */ if (tcsetattr (fileno (stdin),TCSANOW , &flags) !=0 ) {perror ("tcsetattr" ); +free (password);return NULL ; }
Signature · 1 line
2.11.0
PATCH 4/5 ima-evm-utils: Fix file2bin stat and fopen relations
In reply to Vitaly ChikunovCheck stat(2) return value, use fstat(2) to avoid race between stat() and fopen(), remove now unused get_filesize(). Fixes CID 229889.
--- src/evmctl.c | 25 ++++++++++++++++++++----- src/imaevm.h | 1 - src/libimaevm.c | 8 -------- 3 files changed, 20 insertions(+), 14 deletions(-)
src/evmctl.c +20 -5
@@ -175,9 +175,10 @@ static int bin2file(const char *file, const char *ext, const unsigned char *datastatic unsigned char *file2bin (const char *file,const char *ext,int *size) {FILE *fp; -int len; +size_t len;unsigned char *data;char name[strlen (file) + (ext ?strlen (ext) :0 ) +2 ]; +struct stat stats;if (ext)sprintf (name,"%s.%s" , file, ext);
@@ -186,18 +187,32 @@ static unsigned char *file2bin(const char *file, const char *ext, int *size)log_info ("Reading to %s\n" , name); - len =get_filesize (name); fp =fopen (name,"r" );if (!fp) {log_err ("Failed to open: %s\n" , name);return NULL ; } +if (fstat (fileno (fp), &stats) ==-1 ) { +log_err ("Failed to fstat: %s (%s)\n" , name,strerror (errno)); +fclose (fp); +return NULL ; + } + len = stats.st_size; + data =malloc (len); -if (!fread (data, len,1 , fp)) - len =0 ; +if (!data) { +log_err ("Failed to malloc %zu bytes: %s\n" , len, name); +fclose (fp); +return NULL ; + } +if (fread (data, len,1 , fp) != len) { +log_err ("Failed to fread %zu bytes: %s\n" , len, name); +fclose (fp); +return NULL ; + }fclose (fp); - *size = len; + *size = (int )len;return data; }
src/imaevm.h +0 -1
@@ -211,7 +211,6 @@ extern struct libevm_params params;void do_dump (FILE *fp,const void *ptr,int len,bool cr);void dump (const void *ptr,int len); -int get_filesize (const char *filename);int ima_calc_hash (const char *file,uint8_t *hash);int get_hash_algo (const char *algo);RSA *read_pub_key (const char *keyfile,int x509);
src/libimaevm.c +0 -8
@@ -116,14 +116,6 @@ const char *get_hash_algo_by_id(int algo)return "unknown" ; } -int get_filesize (const char *filename) -{ -struct stat stats; -/* Need to know the file length */ -stat (filename, &stats); -return (int )stats.st_size; -} -static inline off_t get_fdsize (int fd) {struct stat stats;
Signature · 1 line
2.11.0
Mimi Zohar
maintainerRe: [PATCH v1 4/5] ima-evm-utils: Fix file2bin stat and fopen relations
On Sat, 2019-07-13 at 00:28 +0300, Vitaly Chikunov wrote:
<snip>
Quoted 12 lines
src/evmctl.c +2
-1@@ -186,18 +187,32 @@ static unsigned char *file2bin(const char *file, const char *ext, int *size)log_info ("Reading to %s\n" , name); - len =get_filesize (name); fp =fopen (name,"r" );if (!fp) {log_err ("Failed to open: %s\n" , name);return NULL ; } +if (fstat (fileno (fp), &stats) ==-1 ) { +log_err ("Failed to fstat: %s (%s)\n" , name,strerror (errno));
src/evmctl.c static unsigned char *file2bin(const char *file, const char *ext, int *size) · line 204
Quoted 10 lines
src/evmctl.c +7
-2+fclose (fp); +return NULL ; + } + len = stats.st_size; + data =malloc (len); -if (!fread (data, len,1 , fp)) - len =0 ; +if (!data) { +log_err ("Failed to malloc %zu bytes: %s\n" , len, name);
Missing "free(data)"
src/evmctl.c static unsigned char *file2bin(const char *file, const char *ext, int *size) · line 210
Quoted 6 lines
src/evmctl.c +6
-0+fclose (fp); +return NULL ; + } +if (fread (data, len,1 , fp) != len) { +log_err ("Failed to fread %zu bytes: %s\n" , len, name); +fclose (fp);
and here
Quoted 9 lines
src/evmctl.c +3
-1+return NULL ; + }fclose (fp); - *size = len; + *size = (int )len;return data; }
Re: [PATCH v1 4/5] ima-evm-utils: Fix file2bin stat and fopen relations
Mimi,
Quoted 17 lines · Mimi Zohar
Quoted 16 lines · Vitaly Chikunov
src/evmctl.c +6
-1@@ -186,18 +187,32 @@ static unsigned char *file2bin(const char *file, const char *ext, int *size)log_info ("Reading to %s\n" , name); - len =get_filesize (name); fp =fopen (name,"r" );if (!fp) {log_err ("Failed to open: %s\n" , name);return NULL ; } +if (fstat (fileno (fp), &stats) ==-1 ) { +log_err ("Failed to fstat: %s (%s)\n" , name,strerror (errno)); +fclose (fp); +return NULL ; + } + len = stats.st_size;
Quoted 8 lines
src/evmctl.c static unsigned char *file2bin(const char *file, const char *ext, int *size) · line 204
Quoted 6 lines
src/evmctl.c +3
-2+ data =malloc (len); -if (!fread (data, len,1 , fp)) - len =0 ; +if (!data) { +log_err ("Failed to malloc %zu bytes: %s\n" , len, name);Missing "free(data)"
In the next patch set I will apply all your suggestions except this one, because this is return where data was not allocated.
Quoted 17 lines
src/evmctl.c static unsigned char *file2bin(const char *file, const char *ext, int *size) · line 210
Quoted 6 lines
src/evmctl.c +6
-0+fclose (fp); +return NULL ; + } +if (fread (data, len,1 , fp) != len) { +log_err ("Failed to fread %zu bytes: %s\n" , len, name); +fclose (fp);and here
Quoted 9 lines
src/evmctl.c +3
-1+return NULL ; + }fclose (fp); - *size = len; + *size = (int )len;return data; }
PATCH 5/5 ima-evm-utils: Add more error checking in add_file_hash
In reply to Vitaly ChikunovCheck return value of fstat(2) in add_file_hash() and remove now unused get_fdsize().
--- src/libimaevm.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
src/libimaevm.c +7 -9
@@ -116,20 +116,13 @@ const char *get_hash_algo_by_id(int algo)return "unknown" ; } -static inline off_t get_fdsize (int fd) -{ -struct stat stats; -/* Need to know the file length */ -fstat (fd, &stats); -return stats.st_size; -} -static int add_file_hash (const char *file,EVP_MD_CTX *ctx) {uint8_t *data;int err =-1 , bs =DATA_SIZE ;off_t size, len;FILE *fp; +struct stat stats; fp =fopen (file,"r" );if (!fp) {
@@ -143,7 +136,12 @@ static int add_file_hash(const char *file, EVP_MD_CTX *ctx) goto out; } -for (size =get_fdsize (fileno (fp)); size; size -= len) { +if (fstat (fileno (fp), &stats) ==-1 ) { +log_err ("Failed to fstat: %s (%s)\n" , file,strerror (errno)); + goto out; + } + +for (size = stats.st_size; size; size -= len) { len =MIN (size, bs);if (!fread (data, len,1 , fp)) {if (ferror (fp)) {
Signature · 1 line
2.11.0
Mimi Zohar
maintainerQuoted 2 lines · Vitaly Chikunov
file2bin()may return NULL, which is set to tmp, which is passed to memcpy. Add explicit check for it. CID 229904.
Maybe move the CID to a "Fixes" tag with an indication of the CID origin.
src/evmctl.c static int verify_ima(const char *file) · line 824
Quoted 13 lines
--- src/evmctl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)src/evmctl.c +0
-1@@ -821,7 +821,15 @@ static int verify_ima(const char *file)if (sigfile) {void *tmp =file2bin (file,"sig" , &len); -assert (len <=sizeof (sig));
Thanks for removing the "assert". It would stop the measurement list verification or walking a file system in the middle.
src/evmctl.c static int verify_ima(const char *file) · line 829
Quoted 6 lines
src/evmctl.c +6
-0+if (!tmp) { +log_err ("Failed reading: %s\n" , file); +return -1 ; + } +if (len >sizeof (sig)) { +log_err ("File is too big: %s\n" , file);
We're reading the file signature file. Perhaps say,"File signature is ...".
Quoted 6 lines
src/evmctl.c +3
-0+free (tmp); +return -1 ; + }memcpy (sig, tmp, len);free (tmp); }else {