From: David Laight <david.laight.linux@gmail.com>
To: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Cc: David Laight <david.laight.linux@gmail.com>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
Kir Chou <note351@hotmail.com>,
Ryan Roberts <ryan.roberts@arm.com>,
Mark Rutland <mark.rutland@arm.com>, Kees Cook <kees@kernel.org>
Subject: [PATCH next 3/7] random32: Fix tests for xor -> add change to prandom_u32_state()
Date: Mon, 2 Nov 2026 20:05:18 +0000 [thread overview]
Message-ID: <20261102200522.3337-4-david.laight.linux@gmail.com> (raw)
In-Reply-To: <20261102200522.3337-1-david.laight.linux@gmail.com>
The test vectors check the result of prandom_u32_state() against known
values. The change to prandom_u32_state() to add the four values to
make determining the state not completely trivial breaks this.
Rather than change the test data fix the tests by adding a local
function that combines the four values using xor.
Signed-off-by: David Laight <david.laight.linux@gmail.com>
---
lib/tests/random32_kunit.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/tests/random32_kunit.c b/lib/tests/random32_kunit.c
index 0b4af2b09c01..ccf439686fda 100644
--- a/lib/tests/random32_kunit.c
+++ b/lib/tests/random32_kunit.c
@@ -136,6 +136,16 @@ static void prandom_state_test_seed(struct rnd_state *state, u32 seed)
state->s4 = __seed(LCG(state->s3), 128U);
}
+/*
+ * prandom_u32_state() adds the values to stop the generator being linear.
+ * To avoid changing the test recover the expected value.
+ */
+static u32 prandom_u32_state_xor(struct rnd_state *state)
+{
+ prandom_u32_state(state);
+ return state->s1 ^ state->s2 ^ state->s3 ^ state->s4;
+}
+
static void test_prandom_seed_boundary(struct kunit *test)
{
int i;
@@ -144,7 +154,7 @@ static void test_prandom_seed_boundary(struct kunit *test)
for (i = 0; i < ARRAY_SIZE(test1); i++) {
prandom_state_test_seed(&state, test1[i].seed);
prandom_warmup(&state);
- KUNIT_EXPECT_EQ(test, test1[i].result, prandom_u32_state(&state));
+ KUNIT_EXPECT_EQ(test, test1[i].result, prandom_u32_state_xor(&state));
}
}
@@ -160,7 +170,7 @@ static void test_prandom_taus113(struct kunit *test)
for (j = 0; j < test2[i].iteration - 1; j++)
prandom_u32_state(&state);
- KUNIT_EXPECT_EQ(test, test2[i].result, prandom_u32_state(&state));
+ KUNIT_EXPECT_EQ(test, test2[i].result, prandom_u32_state_xor(&state));
}
}
--
2.39.5
next prev parent reply other threads:[~2026-11-02 20:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-02 20:05 [PATCH next 0/7] random32: Improve security and simplify keying David Laight
2026-11-02 20:05 ` [PATCH next 1/7] random32: Improve security of prandom_u32_state() David Laight
2026-11-02 20:05 ` [PATCH next 2/7] random32: Remove some unnecessary #includes David Laight
2026-11-02 20:05 ` David Laight [this message]
2026-11-02 20:05 ` [PATCH next 4/7] random32: Change prandom_seed_state() to be a real function David Laight
2026-11-02 20:05 ` [PATCH next 5/7] random32: Use add (not xor) in tools prandom_u32_state() David Laight
2026-11-02 20:05 ` [PATCH next 6/7] random32: prandom_seed_state() use all 64 bits of the seed David Laight
2026-11-02 20:05 ` [PATCH next 7/7] random32: Simplify prandom_seed_full_state() David Laight
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=20261102200522.3337-4-david.laight.linux@gmail.com \
--to=david.laight.linux@gmail.com \
--cc=Jason@zx2c4.com \
--cc=akpm@linux-foundation.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=note351@hotmail.com \
--cc=ryan.roberts@arm.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.