From: Eric Biggers <ebiggers@kernel.org>
To: linux-crypto@vger.kernel.org, fsverity@lists.linux.dev,
dm-devel@lists.linux.dev
Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org,
Ard Biesheuvel <ardb@kernel.org>,
Sami Tolvanen <samitolvanen@google.com>,
Bart Van Assche <bvanassche@acm.org>
Subject: [PATCH v3 2/8] crypto: testmgr - generate power-of-2 lengths more often
Date: Mon, 6 May 2024 17:23:37 -0700 [thread overview]
Message-ID: <20240507002343.239552-3-ebiggers@kernel.org> (raw)
In-Reply-To: <20240507002343.239552-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Implementations of hash functions often have special cases when lengths
are a multiple of the hash function's internal block size (e.g. 64 for
SHA-256, 128 for SHA-512). Currently, when the fuzz testing code
generates lengths, it doesn't prefer any length mod 64 over any other.
This limits the coverage of these special cases.
Therefore, this patch updates the fuzz testing code to generate
power-of-2 lengths and divide messages exactly in half a bit more often.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
crypto/testmgr.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 00f5a6cf341a..2c57ebcaf368 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -901,18 +901,24 @@ static unsigned int generate_random_length(struct rnd_state *rng,
{
unsigned int len = prandom_u32_below(rng, max_len + 1);
switch (prandom_u32_below(rng, 4)) {
case 0:
- return len % 64;
+ len %= 64;
+ break;
case 1:
- return len % 256;
+ len %= 256;
+ break;
case 2:
- return len % 1024;
+ len %= 1024;
+ break;
default:
- return len;
+ break;
}
+ if (prandom_u32_below(rng, 4) == 0)
+ len = rounddown_pow_of_two(len);
+ return len;
}
/* Flip a random bit in the given nonempty data buffer */
static void flip_random_bit(struct rnd_state *rng, u8 *buf, size_t size)
{
@@ -1004,10 +1010,12 @@ static char *generate_random_sgl_divisions(struct rnd_state *rng,
unsigned int this_len;
const char *flushtype_str;
if (div == &divs[max_divs - 1] || prandom_bool(rng))
this_len = remaining;
+ else if (prandom_u32_below(rng, 4) == 0)
+ this_len = (remaining + 1) / 2;
else
this_len = prandom_u32_inclusive(rng, 1, remaining);
div->proportion_of_total = this_len;
if (prandom_u32_below(rng, 4) == 0)
--
2.45.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-05-07 0:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 0:23 [PATCH v3 0/8] Optimize dm-verity and fsverity using multibuffer hashing Eric Biggers
2024-05-07 0:23 ` [PATCH v3 1/8] crypto: shash - add support for finup_mb Eric Biggers
2024-05-07 0:23 ` Eric Biggers [this message]
2024-05-07 0:23 ` [PATCH v3 3/8] crypto: testmgr - add tests " Eric Biggers
2024-05-07 0:23 ` [PATCH v3 4/8] crypto: x86/sha256-ni - add support " Eric Biggers
2024-05-07 0:23 ` [PATCH v3 5/8] crypto: arm64/sha256-ce " Eric Biggers
2024-05-07 0:23 ` [PATCH v3 6/8] fsverity: improve performance by using multibuffer hashing Eric Biggers
2024-05-31 4:50 ` Herbert Xu
2024-05-31 6:13 ` Eric Biggers
2024-05-31 6:52 ` Eric Biggers
2024-05-31 8:49 ` Herbert Xu
2024-05-31 18:51 ` Eric Biggers
2024-06-03 18:50 ` Eric Biggers
2024-06-04 9:39 ` Herbert Xu
2024-05-31 8:38 ` Herbert Xu
2024-05-07 0:23 ` [PATCH v3 7/8] dm-verity: hash blocks with shash import+finup when possible Eric Biggers
2024-05-07 0:23 ` [PATCH v3 8/8] dm-verity: improve performance by using multibuffer hashing Eric Biggers
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=20240507002343.239552-3-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=ardb@kernel.org \
--cc=bvanassche@acm.org \
--cc=dm-devel@lists.linux.dev \
--cc=fsverity@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=samitolvanen@google.com \
--cc=x86@kernel.org \
/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).