From: Stefan Berger <stefanb@linux.ibm.com> To: linux-integrity@vger.kernel.org Cc: zohar@linux.ibm.com, dmitry.kasatkin@gmail.com, Stefan Berger <stefanb@linux.ibm.com> Subject: [PATCH 1/6] libimaevm: Properly check for error returned by EVP_DigestUpdate Date: Mon, 19 Apr 2021 11:01:46 -0400 [thread overview] Message-ID: <20210419150151.236409-2-stefanb@linux.ibm.com> (raw) In-Reply-To: <20210419150151.236409-1-stefanb@linux.ibm.com> The error checking in add_dir_hash was wrong. EVP_DigestUpdate returns 1 on success and 0 on error, so we cannot just accumulate it using or'ing. From the man page: EVP_DigestInit_ex(), EVP_DigestUpdate(), EVP_DigestFinal_ex() Returns 1 for success and 0 for failure. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> --- src/libimaevm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libimaevm.c b/src/libimaevm.c index fa6c278..d8fc0d4 100644 --- a/src/libimaevm.c +++ b/src/libimaevm.c @@ -179,7 +179,6 @@ out: static int add_dir_hash(const char *file, EVP_MD_CTX *ctx) { - int err; struct dirent *de; DIR *dir; unsigned long long ino, off; @@ -198,11 +197,10 @@ static int add_dir_hash(const char *file, EVP_MD_CTX *ctx) type = de->d_type; log_debug("entry: %s, ino: %llu, type: %u, off: %llu, reclen: %hu\n", de->d_name, ino, type, off, de->d_reclen); - err = EVP_DigestUpdate(ctx, de->d_name, strlen(de->d_name)); - /*err |= EVP_DigestUpdate(ctx, &off, sizeof(off));*/ - err |= EVP_DigestUpdate(ctx, &ino, sizeof(ino)); - err |= EVP_DigestUpdate(ctx, &type, sizeof(type)); - if (!err) { + if (EVP_DigestUpdate(ctx, de->d_name, strlen(de->d_name)) != 1 || + /* EVP_DigestUpdate(ctx, &off, sizeof(off)) != 1 || */ + EVP_DigestUpdate(ctx, &ino, sizeof(ino)) != 1|| + EVP_DigestUpdate(ctx, &type, sizeof(type)) != 1) { log_err("EVP_DigestUpdate() failed\n"); output_openssl_errors(); result = 1; -- 2.30.2
next prev parent reply other threads:[~2021-04-19 15:02 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-19 15:01 [PATCH 0/6] ima-evm-utils: Some cleanups and bugfixes Stefan Berger 2021-04-19 15:01 ` Stefan Berger [this message] 2021-04-19 15:01 ` [PATCH 2/6] libimaevm: Remove unused off variable Stefan Berger 2021-04-19 15:01 ` [PATCH 3/6] libimaevm: Rename variable returned from readlink to len Stefan Berger 2021-04-19 15:22 ` Stefan Berger 2021-04-19 15:01 ` [PATCH 4/6] libimaevm: Rename variable from cr to newline Stefan Berger 2021-04-19 15:01 ` [PATCH 5/6] libimaevm: Report unsupported filetype using log_err Stefan Berger 2021-04-19 15:01 ` [PATCH 6/6] libimaevm: Use function parameter algo for name of hash Stefan Berger 2021-06-25 20:42 ` [PATCH 0/6] ima-evm-utils: Some cleanups and bugfixes Mimi Zohar
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=20210419150151.236409-2-stefanb@linux.ibm.com \ --to=stefanb@linux.ibm.com \ --cc=dmitry.kasatkin@gmail.com \ --cc=linux-integrity@vger.kernel.org \ --cc=zohar@linux.ibm.com \ --subject='Re: [PATCH 1/6] libimaevm: Properly check for error returned by EVP_DigestUpdate' \ /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
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).