Commit 85a1f777 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

random: mix in architectural randomness earlier in extract_buf() 



Previously if CPU chip had a built-in random number generator (i.e.,
RDRAND on newer x86 chips), we mixed it in at the very end of
extract_buf() using an XOR operation.

We now mix it in right after the calculate a hash across the entire
pool.  This has the advantage that any contribution of entropy from
the CPU's HWRNG will get mixed back into the pool.  In addition, it
means that if the HWRNG has any defects (either accidentally or
maliciously introduced), this will be mitigated via the non-linear
transform of the SHA-1 hash function before we hand out generated
output.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 61875f30

drivers/char/random.c

+12 −12
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ static void extract_buf(struct entropy_store *r, __u8 *out) 
	int i;

	union {

		__u32 w[5];

		unsigned long l[LONGS(EXTRACT_SIZE)];

		unsigned long l[LONGS(20)];

	} hash;

	__u32 workspace[SHA_WORKSPACE_WORDS];

	__u8 extract[64];
@@ -916,6 +916,17 @@ static void extract_buf(struct entropy_store *r, __u8 *out) 
	for (i = 0; i < r->poolinfo->poolwords; i += 16)

		sha_transform(hash.w, (__u8 *)(r->pool + i), workspace);



	/*

	 * If we have a architectural hardware random number

	 * generator, mix that in, too.

	 */

	for (i = 0; i < LONGS(20); i++) {

		unsigned long v;

		if (!arch_get_random_long(&v))

			break;

		hash.l[i] ^= v;

	}



	/*

	 * We mix the hash back into the pool to prevent backtracking

	 * attacks (where the attacker knows the state of the pool
@@ -945,17 +956,6 @@ static void extract_buf(struct entropy_store *r, __u8 *out) 
	hash.w[1] ^= hash.w[4];

	hash.w[2] ^= rol32(hash.w[2], 16);



	/*

	 * If we have a architectural hardware random number

	 * generator, mix that in, too.

	 */

	for (i = 0; i < LONGS(EXTRACT_SIZE); i++) {

		unsigned long v;

		if (!arch_get_random_long(&v))

			break;

		hash.l[i] ^= v;

	}



	memcpy(out, &hash, EXTRACT_SIZE);

	memset(&hash, 0, sizeof(hash));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE