diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 12:49:03 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 12:49:03 -0400 |
| commit | 690d33d4fc93e8f18c737e3ec564b8fe7c820b86 (patch) | |
| tree | aaf7b84905a2f634870a5b22aba086f68e95720f | |
| parent | e5f20127c52f9e1549e776b08412d8fd207eab42 (diff) | |
| download | longterm-queue-4.8-690d33d4fc93e8f18c737e3ec564b8fe7c820b86.tar.gz | |
random: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/random-use-chacha20-for-get_random_int-long.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/queue/random-use-chacha20-for-get_random_int-long.patch b/queue/random-use-chacha20-for-get_random_int-long.patch index 0fe8d76..6ba7dc7 100644 --- a/queue/random-use-chacha20-for-get_random_int-long.patch +++ b/queue/random-use-chacha20-for-get_random_int-long.patch @@ -1,4 +1,4 @@ -From f5b98461cb8167ba362ad9f74c41d126b7becea7 Mon Sep 17 00:00:00 2001 +From 9ed1e1338f46b2b726facc2e40959131d29ff9c4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Fri, 6 Jan 2017 19:32:01 +0100 Subject: [PATCH] random: use chacha20 for get_random_int/long @@ -36,12 +36,13 @@ Cc: Theodore Ts'o <tytso@mit.edu> Cc: Hannes Frederic Sowa <hannes@stressinduktion.org> Cc: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/char/random.c b/drivers/char/random.c -index 9d147d456598..b800e5479b7d 100644 +index 3efb3bf0ab83..19d659d2ea3c 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -2016,63 +2016,65 @@ struct ctl_table random_table[] = { +@@ -2042,63 +2042,65 @@ struct ctl_table random_table[] = { }; #endif /* CONFIG_SYSCTL */ @@ -146,13 +147,13 @@ index 9d147d456598..b800e5479b7d 100644 +#endif +EXPORT_SYMBOL(get_random_int); - /** - * randomize_page - Generate a random, page aligned address + /* + * randomize_range() returns a start address such that diff --git a/include/linux/random.h b/include/linux/random.h -index 7bd2403e4fef..16ab429735a7 100644 +index 3d6e9815cd85..1c366e7a717b 100644 --- a/include/linux/random.h +++ b/include/linux/random.h -@@ -37,7 +37,6 @@ extern void get_random_bytes(void *buf, int nbytes); +@@ -26,7 +26,6 @@ extern void get_random_bytes(void *buf, int nbytes); extern int add_random_ready_callback(struct random_ready_callback *rdy); extern void del_random_ready_callback(struct random_ready_callback *rdy); extern void get_random_bytes_arch(void *buf, int nbytes); @@ -161,10 +162,10 @@ index 7bd2403e4fef..16ab429735a7 100644 #ifndef MODULE extern const struct file_operations random_fops, urandom_fops; diff --git a/init/main.c b/init/main.c -index b0c9d6facef9..09beb7fc6e8c 100644 +index a8a58e2794a5..ea8d17b6e531 100644 --- a/init/main.c +++ b/init/main.c -@@ -879,7 +879,6 @@ static void __init do_basic_setup(void) +@@ -867,7 +867,6 @@ static void __init do_basic_setup(void) do_ctors(); usermodehelper_enable(); do_initcalls(); |