Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 804b19ca authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

random: properly align get_random_int_hash 



commit b1132deac01c2332d234fa821a70022796b79182 upstream.

get_random_long() reads from the get_random_int_hash array using an
unsigned long pointer.  For this code to be guaranteed correct on all
architectures, the array must be aligned to an unsigned long boundary.

Signed-off-by: default avatarEric Biggers <ebiggers3@gmail.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7533e65

drivers/char/random.c

+3 −1
Original line number Diff line number Diff line
@@ -1714,13 +1714,15 @@ int random_int_secret_init(void) 
	return 0;

}



static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash)

		__aligned(sizeof(unsigned long));



/*

 * Get a random word for internal kernel use only. Similar to urandom but

 * with the goal of minimal entropy pool depletion. As a result, the random

 * value is not cryptographically secure but for several uses the cost of

 * depleting entropy is too high

 */

static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);

unsigned int get_random_int(void)

{

	__u32 *hash;