From: Vitaly Chikunov <vt@altlinux.org>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
linux-integrity@vger.kernel.org
Subject: [PATCH v2 4/5] ima-evm-utils: Fix file2bin stat and fopen relations
Date: Mon, 15 Jul 2019 23:05:52 +0300 [thread overview]
Message-ID: <20190715200553.22403-4-vt@altlinux.org> (raw)
In-Reply-To: <20190715200553.22403-1-vt@altlinux.org>
Check 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 | 26 +++++++++++++++++++++-----
src/imaevm.h | 1 -
src/libimaevm.c | 8 --------
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/evmctl.c b/src/evmctl.c
index f15056b..61808d2 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -175,9 +175,10 @@ static int bin2file(const char *file, const char *ext, const unsigned char *data
static 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,33 @@ 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);
+ free(data);
+ return NULL;
+ }
fclose(fp);
- *size = len;
+ *size = (int)len;
return data;
}
diff --git a/src/imaevm.h b/src/imaevm.h
index dc81a3a..36050f4 100644
--- a/src/imaevm.h
+++ b/src/imaevm.h
@@ -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);
diff --git a/src/libimaevm.c b/src/libimaevm.c
index f8ab812..1562aaf 100644
--- a/src/libimaevm.c
+++ b/src/libimaevm.c
@@ -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;
--
2.11.0
next prev parent reply other threads:[~2019-07-15 20:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 20:05 [PATCH v2 1/5] ima-evm-utils: Fix null dereference from file2bin to memcpy Vitaly Chikunov
2019-07-15 20:05 ` [PATCH v2 2/5] ima-evm-utils: Fix possible xattr_value overflows in calc_evm_hash Vitaly Chikunov
2019-07-15 20:05 ` [PATCH v2 3/5] ima-evm-utils: Fix memory leak in get_password Vitaly Chikunov
2019-07-15 20:05 ` Vitaly Chikunov [this message]
2019-07-15 20:05 ` [PATCH v2 5/5] ima-evm-utils: Add more error checking in add_file_hash Vitaly Chikunov
2019-07-16 14:46 ` [PATCH v2 1/5] ima-evm-utils: Fix null dereference from file2bin to memcpy Mimi Zohar
2019-07-16 14:59 ` Vitaly Chikunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190715200553.22403-4-vt@altlinux.org \
--to=vt@altlinux.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=linux-integrity@vger.kernel.org \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).