Skip to content

Commit 1934252

Browse files
author
Herton R. Krzesinski
committed
Merge: crypto: jitter - consider 32 LSB for APT
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2019 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2164067 Upstream Status: merged into the linux.git A system with AMD EPYC Rome CPU fails to boot RHEL9 in FIPS mode due to missing upstream 552d03a ("crypto: jitter - consider 32 LSB for APT"). This upstream patch applies cleanly. Signed-off-by: Vladis Dronov <vdronov@redhat.com> Approved-by: Clemens Lang <cllang@redhat.com> Approved-by: Herbert Xu <zxu@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 9d9bbd0 + 6e71459 commit 1934252

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

crypto/jitterentropy.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ static int jent_stuck(struct rand_data *ec, __u64 current_delta)
281281
{
282282
__u64 delta2 = jent_delta(ec->last_delta, current_delta);
283283
__u64 delta3 = jent_delta(ec->last_delta2, delta2);
284-
unsigned int delta_masked = current_delta & JENT_APT_WORD_MASK;
285284

286285
ec->last_delta = current_delta;
287286
ec->last_delta2 = delta2;
@@ -290,7 +289,7 @@ static int jent_stuck(struct rand_data *ec, __u64 current_delta)
290289
* Insert the result of the comparison of two back-to-back time
291290
* deltas.
292291
*/
293-
jent_apt_insert(ec, delta_masked);
292+
jent_apt_insert(ec, current_delta);
294293

295294
if (!current_delta || !delta2 || !delta3) {
296295
/* RCT with a stuck bit */

0 commit comments

Comments
 (0)