Commit 47d06e53 authored by Theodore Ts'o's avatar Theodore Ts'o

random: run random_int_secret_init() run after all late_initcalls

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.

Cc: stable@vger.kernel.org
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 6e466452
...@@ -1462,12 +1462,11 @@ struct ctl_table random_table[] = { ...@@ -1462,12 +1462,11 @@ struct ctl_table random_table[] = {
static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned; 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)); get_random_bytes(random_int_secret, sizeof(random_int_secret));
return 0; return 0;
} }
late_initcall(random_int_secret_init);
/* /*
* 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
......
...@@ -17,6 +17,7 @@ extern void add_interrupt_randomness(int irq, int irq_flags); ...@@ -17,6 +17,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(void *buf, int nbytes);
extern void get_random_bytes_arch(void *buf, int nbytes); extern void get_random_bytes_arch(void *buf, int nbytes);
void generate_random_uuid(unsigned char uuid_out[16]); void generate_random_uuid(unsigned char uuid_out[16]);
extern int random_int_secret_init(void);
#ifndef MODULE #ifndef MODULE
extern const struct file_operations random_fops, urandom_fops; extern const struct file_operations random_fops, urandom_fops;
......
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/elevator.h> #include <linux/elevator.h>
#include <linux/sched_clock.h> #include <linux/sched_clock.h>
#include <linux/random.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/bugs.h> #include <asm/bugs.h>
...@@ -778,6 +779,7 @@ static void __init do_basic_setup(void) ...@@ -778,6 +779,7 @@ static void __init do_basic_setup(void)
do_ctors(); do_ctors();
usermodehelper_enable(); usermodehelper_enable();
do_initcalls(); do_initcalls();
random_int_secret_init();
} }
static void __init do_pre_smp_initcalls(void) static void __init do_pre_smp_initcalls(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment