From: Eric Biggers Date: Thu, 5 May 2016 01:08:39 +0000 (-0400) Subject: random: properly align get_random_int_hash X-Git-Tag: v3.12.63~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c1ff19426bed544da5e0ee7be56c7f52a330e44;p=thirdparty%2Fkernel%2Fstable.git 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: Eric Biggers Signed-off-by: Theodore Ts'o Signed-off-by: Jiri Slaby --- diff --git a/drivers/char/random.c b/drivers/char/random.c index f6b25db16791f..85e771c26488c 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1465,13 +1465,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;