Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

random: properly align get_random_int_hash

Browse source 
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 <ebiggers3@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I934433b231a96a0ded6dc8c41d93b536f2f0b3a2
This commit is contained in:
Eric Biggers 2016-05-04 21:08:39 -04:00 committed by followmsi
parent 095f11b227
commit 5aba32ba26
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/char/random.c
View file

@ -1532,13 +1532,15 @@ int random_int_secret_init(void)
return 0; 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 * 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 * 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 * value is not cryptographically secure but for several uses the cost of
* depleting entropy is too high * depleting entropy is too high
*/ */
DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);
unsigned int get_random_int(void) unsigned int get_random_int(void)
{ {
__u32 *hash; __u32 *hash;