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

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

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

drivers/char/random.c

+1 −2
Original line number Diff line number Diff line
@@ -1462,12 +1462,11 @@ struct 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

include/linux/random.h

+1 −0
Original line number Diff line number Diff line
@@ -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_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;

init/main.c

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
#include <linux/blkdev.h>

#include <linux/elevator.h>

#include <linux/sched_clock.h>

#include <linux/random.h>



#include <asm/io.h>

#include <asm/bugs.h>
@@ -778,6 +779,7 @@ static void __init do_basic_setup(void) 
	do_ctors();

	usermodehelper_enable();

	do_initcalls();

	random_int_secret_init();

}



static void __init do_pre_smp_initcalls(void)