From: Greg Kroah-Hartman Date: Fri, 19 Aug 2016 07:35:48 +0000 (+0200) Subject: removed random-properly-align-get_random_int_hash.patch from 3.14 and 4.4 X-Git-Tag: v3.14.77~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3013dcf56f66ef6036538842608652fdf579dd26;p=thirdparty%2Fkernel%2Fstable-queue.git removed random-properly-align-get_random_int_hash.patch from 3.14 and 4.4 --- diff --git a/queue-3.14/random-properly-align-get_random_int_hash.patch b/queue-3.14/random-properly-align-get_random_int_hash.patch deleted file mode 100644 index 94439644cf6..00000000000 --- a/queue-3.14/random-properly-align-get_random_int_hash.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b1132deac01c2332d234fa821a70022796b79182 Mon Sep 17 00:00:00 2001 -From: Eric Biggers -Date: Wed, 4 May 2016 21:08:39 -0400 -Subject: random: properly align get_random_int_hash - -From: Eric Biggers - -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 -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/random.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -1632,13 +1632,15 @@ int random_int_secret_init(void) - 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 - * 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 - * depleting entropy is too high - */ --static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash); - unsigned int get_random_int(void) - { - __u32 *hash; diff --git a/queue-4.4/random-properly-align-get_random_int_hash.patch b/queue-4.4/random-properly-align-get_random_int_hash.patch deleted file mode 100644 index e33879ca9e2..00000000000 --- a/queue-4.4/random-properly-align-get_random_int_hash.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b1132deac01c2332d234fa821a70022796b79182 Mon Sep 17 00:00:00 2001 -From: Eric Biggers -Date: Wed, 4 May 2016 21:08:39 -0400 -Subject: random: properly align get_random_int_hash - -From: Eric Biggers - -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 -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/random.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -1793,13 +1793,15 @@ int random_int_secret_init(void) - 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 - * 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 - * depleting entropy is too high - */ --static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash); - unsigned int get_random_int(void) - { - __u32 *hash;