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 v1 1/5] ima-evm-utils: Fix EVP_MD_CTX leak in ima_calc_hash
Date: Mon, 8 Jul 2019 02:48:33 +0300 [thread overview]
Message-ID: <20190707234837.4866-2-vt@altlinux.org> (raw)
In-Reply-To: <20190707234837.4866-1-vt@altlinux.org>
When pctx is allocated using EVP_MD_CTX_new() it should be freed.
Found with ASan.
Fixes: 81010f0 ("ima-evm-utils: Add backward compatible support for openssl 1.1")
Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
---
src/libimaevm.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/libimaevm.c b/src/libimaevm.c
index 51d6c33..fe1962b 100644
--- a/src/libimaevm.c
+++ b/src/libimaevm.c
@@ -252,19 +252,21 @@ int ima_calc_hash(const char *file, uint8_t *hash)
err = lstat(file, &st);
if (err < 0) {
log_err("Failed to stat: %s\n", file);
- return err;
+ goto err;
}
md = EVP_get_digestbyname(params.hash_algo);
if (!md) {
log_err("EVP_get_digestbyname(%s) failed\n", params.hash_algo);
- return 1;
+ err = 1;
+ goto err;
}
err = EVP_DigestInit(pctx, md);
if (!err) {
log_err("EVP_DigestInit() failed\n");
- return 1;
+ err = 1;
+ goto err;
}
switch (st.st_mode & S_IFMT) {
@@ -283,19 +285,25 @@ int ima_calc_hash(const char *file, uint8_t *hash)
break;
default:
log_errno("Unsupported file type");
- return -1;
+ err = -1;
+ goto err;
}
if (err)
- return err;
+ goto err;
err = EVP_DigestFinal(pctx, hash, &mdlen);
if (!err) {
log_err("EVP_DigestFinal() failed\n");
- return 1;
+ err = 1;
+ goto err;
}
-
- return mdlen;
+ err = mdlen;
+err:
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+ EVP_MD_CTX_free(pctx);
+#endif
+ return err;
}
EVP_PKEY *read_pub_pkey(const char *keyfile, int x509)
--
2.11.0
next prev parent reply other threads:[~2019-07-07 23:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-07 23:48 [PATCH v1 0/5] ima-evm-utils: Assorted fixes and improvements Vitaly Chikunov
2019-07-07 23:48 ` Vitaly Chikunov [this message]
2019-07-07 23:48 ` [PATCH v1 2/5] ima-evm-utils: Fix memory leak in init_public_keys Vitaly Chikunov
2019-07-07 23:48 ` [PATCH v1 3/5] ima-evm-utils: Preload public keys for ima_verify Vitaly Chikunov
2019-07-07 23:48 ` [PATCH v1 4/5] ima-evm-utils: Allow multiple files in ima_verify Vitaly Chikunov
2019-07-27 2:49 ` Vitaly Chikunov
2019-07-07 23:48 ` [PATCH v1 5/5] ima-evm-utils: Fix clang warning about possible unaligned pointer for hdr->keyid Vitaly Chikunov
2019-07-08 15:30 ` [PATCH v1 0/5] ima-evm-utils: Assorted fixes and improvements Mimi Zohar
2019-07-09 15:43 ` Vitaly Chikunov
2019-07-11 19:25 ` Mimi Zohar
2019-07-17 16:38 ` Petr Vorel
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=20190707234837.4866-2-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).