From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Richard W.M. Jones" <rjones@redhat.com>
Subject: [PATCH 06/11] crypto: check that LUKS PBKDF2 iterations count is non-zero
Date: Tue, 6 Sep 2022 09:41:42 +0100 [thread overview]
Message-ID: <20220906084147.1423045-7-berrange@redhat.com> (raw)
In-Reply-To: <20220906084147.1423045-1-berrange@redhat.com>
Both the master key and key slot passphrases are run through the PBKDF2
algorithm. The iterations count is expected to be generally very large
(many 10's or 100's of 1000s). It is hard to define a low level cutoff,
but we can certainly say that iterations count should be non-zero. A
zero count likely indicates an initialization mistake so reject it.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/block-luks.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index e6ee8506b2..254490c256 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -579,6 +579,11 @@ qcrypto_block_luks_check_header(const QCryptoBlockLUKS *luks, Error **errp)
return -1;
}
+ if (luks->header.master_key_iterations == 0) {
+ error_setg(errp, "LUKS key iteration count is zero");
+ return -1;
+ }
+
/* Check all keyslots for corruption */
for (i = 0 ; i < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS ; i++) {
@@ -602,6 +607,12 @@ qcrypto_block_luks_check_header(const QCryptoBlockLUKS *luks, Error **errp)
return -1;
}
+ if (slot1->active == QCRYPTO_BLOCK_LUKS_KEY_SLOT_ENABLED &&
+ slot1->iterations == 0) {
+ error_setg(errp, "Keyslot %zu iteration count is zero", i);
+ return -1;
+ }
+
if (start1 < DIV_ROUND_UP(QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET,
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)) {
error_setg(errp,
--
2.37.2
next prev parent reply other threads:[~2022-09-06 9:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 8:41 [PATCH 00/11] crypto: improve robustness of LUKS metadata validation Daniel P. Berrangé
2022-09-06 8:41 ` [PATCH 01/11] crypto: sanity check that LUKS header strings are NUL-terminated Daniel P. Berrangé
2022-09-06 9:30 ` Richard W.M. Jones
2022-09-06 8:41 ` [PATCH 02/11] crypto: enforce that LUKS stripes is always a fixed value Daniel P. Berrangé
2022-09-06 9:09 ` Richard W.M. Jones
2022-09-06 8:41 ` [PATCH 03/11] crypto: enforce that key material doesn't overlap with LUKS header Daniel P. Berrangé
2022-09-06 8:41 ` [PATCH 04/11] crypto: validate that LUKS payload doesn't overlap with header Daniel P. Berrangé
2022-09-06 9:19 ` Richard W.M. Jones
2022-09-06 8:41 ` [PATCH 05/11] crypto: strengthen the check for key slots overlapping with LUKS header Daniel P. Berrangé
2022-09-06 8:41 ` Daniel P. Berrangé [this message]
2022-09-06 9:26 ` [PATCH 06/11] crypto: check that LUKS PBKDF2 iterations count is non-zero Richard W.M. Jones
2022-10-27 11:59 ` Daniel P. Berrangé
2022-09-06 8:41 ` [PATCH 07/11] crypto: split LUKS header definitions off into file Daniel P. Berrangé
2022-09-06 8:41 ` [PATCH 08/11] crypto: split off helpers for converting LUKS header endianess Daniel P. Berrangé
2022-09-06 8:41 ` [PATCH 09/11] crypto: quote algorithm names in error messages Daniel P. Berrangé
2022-09-06 8:41 ` [PATCH 10/11] crypto: ensure LUKS tests run with GNUTLS crypto provider Daniel P. Berrangé
2022-09-06 8:41 ` [PATCH 11/11] crypto: add test cases for many malformed LUKS header scenarios Daniel P. Berrangé
2022-09-06 9:31 ` [PATCH 00/11] crypto: improve robustness of LUKS metadata validation Richard W.M. Jones
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=20220906084147.1423045-7-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rjones@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.