Commit 552d03a2 authored by Stephan Müller's avatar Stephan Müller Committed by Herbert Xu
Browse files

crypto: jitter - consider 32 LSB for APT 



The APT compares the current time stamp with a pre-set value. The
current code only considered the 4 LSB only. Yet, after reviews by
mathematicians of the user space Jitter RNG version >= 3.1.0, it was
concluded that the APT can be calculated on the 32 LSB of the time
delta. Thi change is applied to the kernel.

This fixes a bug where an AMD EPYC fails this test as its RDTSC value
contains zeros in the LSB. The most appropriate fix would have been to
apply a GCD calculation and divide the time stamp by the GCD. Yet, this
is a significant code change that will be considered for a future
update. Note, tests showed that constantly the GCD always was 32 on
these systems, i.e. the 5 LSB were always zero (thus failing the APT
since it only considered the 4 LSB for its calculation).

Signed-off-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 13389403

crypto/jitterentropy.c

+1 −2
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ static int jent_stuck(struct rand_data *ec, __u64 current_delta) 
{

	__u64 delta2 = jent_delta(ec->last_delta, current_delta);

	__u64 delta3 = jent_delta(ec->last_delta2, delta2);

	unsigned int delta_masked = current_delta & JENT_APT_WORD_MASK;



	ec->last_delta = current_delta;

	ec->last_delta2 = delta2;
@@ -274,7 +273,7 @@ static int jent_stuck(struct rand_data *ec, __u64 current_delta) 
	 * Insert the result of the comparison of two back-to-back time

	 * deltas.

	 */

	jent_apt_insert(ec, delta_masked);

	jent_apt_insert(ec, current_delta);



	if (!current_delta || !delta2 || !delta3) {

		/* RCT with a stuck bit */