From: "Stephan Müller" <smueller@chronox.de>
To: herbert@gondor.apana.org.au
Cc: ebiggers@kernel.org, Jarkko Sakkinen <jarkko@kernel.org>,
mathew.j.martineau@linux.intel.com, dhowells@redhat.com,
linux-crypto@vger.kernel.org, linux-fscrypt@vger.kernel.org,
linux-kernel@vger.kernel.org, keyrings@vger.kernel.org,
simo@redhat.com
Subject: [PATCH v2 7/7] fs: HKDF - remove duplicate memory clearing
Date: Sun, 24 Jan 2021 15:04:50 +0100 [thread overview]
Message-ID: <8714658.CDJkKcVGEf@positron.chronox.de> (raw)
In-Reply-To: <1772794.tdWV9SEqCh@positron.chronox.de>
The clearing of the OKM memory buffer in case of an error is already
performed by the HKDF implementation crypto_hkdf_expand. Thus, the
code clearing is not needed any more in the file system code base.
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
fs/crypto/hkdf.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/crypto/hkdf.c b/fs/crypto/hkdf.c
index ae236b42b1f0..c48dd8ca3a46 100644
--- a/fs/crypto/hkdf.c
+++ b/fs/crypto/hkdf.c
@@ -102,13 +102,10 @@ int fscrypt_hkdf_expand(const struct fscrypt_hkdf *hkdf, u8 context,
.iov_base = (u8 *)info,
.iov_len = infolen,
} };
- int err = crypto_hkdf_expand(hkdf->hmac_tfm,
- info_iov, ARRAY_SIZE(info_iov),
- okm, okmlen);
- if (unlikely(err))
- memzero_explicit(okm, okmlen); /* so caller doesn't need to */
- return err;
+ return crypto_hkdf_expand(hkdf->hmac_tfm,
+ info_iov, ARRAY_SIZE(info_iov),
+ okm, okmlen);
}
void fscrypt_destroy_hkdf(struct fscrypt_hkdf *hkdf)
--
2.26.2
next prev parent reply other threads:[~2021-01-24 14:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 14:01 [PATCH v2 0/7] Add KDF implementations to crypto API Stephan Müller
2021-01-24 14:01 ` [PATCH v2 1/7] crypto: Add key derivation self-test support code Stephan Müller
2021-01-24 14:02 ` [PATCH v2 2/7] crypto: add SP800-108 counter key derivation function Stephan Müller
2021-01-24 14:03 ` [PATCH v2 3/7] crypto: add RFC5869 HKDF Stephan Müller
2021-01-28 20:08 ` Eric Biggers
2021-01-24 14:03 ` [PATCH v2 4/7] security: DH - remove dead code for zero padding Stephan Müller
2021-01-24 14:04 ` [PATCH v2 5/7] security: DH - use KDF implementation from crypto API Stephan Müller
2021-01-24 14:04 ` [PATCH v2 6/7] fs: use HKDF implementation from kernel " Stephan Müller
2021-01-28 20:16 ` Eric Biggers
2021-01-28 20:18 ` Eric Biggers
2021-01-24 14:04 ` Stephan Müller [this message]
2021-01-28 20:21 ` [PATCH v2 7/7] fs: HKDF - remove duplicate memory clearing Eric Biggers
2021-01-24 14:23 ` [PATCH v2 0/7] Add KDF implementations to crypto API Ard Biesheuvel
2021-01-24 14:32 ` Ard Biesheuvel
2021-01-24 14:36 ` Stephan Müller
2021-01-24 14:34 ` Stephan Müller
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=8714658.CDJkKcVGEf@positron.chronox.de \
--to=smueller@chronox.de \
--cc=dhowells@redhat.com \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=jarkko@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=simo@redhat.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).