diff options
author | Theodore Ts'o <tytso@mit.edu> | 2013-09-10 10:52:35 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-22 08:41:44 +0100 |
commit | fa759b5d100c8b0d2ec2b83fcac990f2c3ac13b7 (patch) | |
tree | a01acecffc20a83ca1a5b2f83f57ff2e9552ff10 | |
parent | dccc509a2c4ddf1568a4a6f3e8d4406270fb5307 (diff) | |
download | kernel_samsung_smdk4412-fa759b5d100c8b0d2ec2b83fcac990f2c3ac13b7.zip kernel_samsung_smdk4412-fa759b5d100c8b0d2ec2b83fcac990f2c3ac13b7.tar.gz kernel_samsung_smdk4412-fa759b5d100c8b0d2ec2b83fcac990f2c3ac13b7.tar.bz2 |
random: run random_int_secret_init() run after all late_initcalls
commit 47d06e532e95b71c0db3839ebdef3fe8812fca2c upstream.
The some platforms (e.g., ARM) initializes their clocks as
late_initcalls for some unknown reason. So make sure
random_int_secret_init() is run after all of the late_initcalls are
run.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/char/random.c | 3 | ||||
-rw-r--r-- | include/linux/random.h | 1 | ||||
-rw-r--r-- | init/main.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index fceac95..e7e479c 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1435,12 +1435,11 @@ ctl_table random_table[] = { static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned; -static int __init random_int_secret_init(void) +int random_int_secret_init(void) { get_random_bytes(random_int_secret, sizeof(random_int_secret)); return 0; } -late_initcall(random_int_secret_init); /* * Get a random word for internal kernel use only. Similar to urandom but diff --git a/include/linux/random.h b/include/linux/random.h index ac621ce..7e58ad2 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -56,6 +56,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags); extern void get_random_bytes(void *buf, int nbytes); extern void get_random_bytes_arch(void *buf, int nbytes); void generate_random_uuid(unsigned char uuid_out[16]); +extern int random_int_secret_init(void); #ifndef MODULE extern const struct file_operations random_fops, urandom_fops; diff --git a/init/main.c b/init/main.c index 841e344..cc545df 100644 --- a/init/main.c +++ b/init/main.c @@ -68,6 +68,7 @@ #include <linux/shmem_fs.h> #include <linux/slab.h> #include <linux/perf_event.h> +#include <linux/random.h> #include <asm/io.h> #include <asm/bugs.h> @@ -717,6 +718,7 @@ static void __init do_basic_setup(void) init_irq_proc(); do_ctors(); do_initcalls(); + random_int_secret_init(); } static void __init do_pre_smp_initcalls(void) |