From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Apr 2018 17:36:12 +0000 (+0200)
Subject: add back 4.16 random patch
X-Git-Tag: v3.18.106~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f786c479bb6a090fde9015436a4e75e5c418d09;p=thirdparty%2Fkernel%2Fstable-queue.git

add back 4.16 random patch
---

diff --git a/pending/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch b/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch
similarity index 89%
rename from pending/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch
rename to queue-4.16/random-add-new-ioctl-rndreseedcrng.patch
index ba064572616..09c6542bb0e 100644
--- a/pending/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch
+++ b/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define CRNG_INIT_CNT_THRESH (2*CHACHA20_KEY_SIZE)
  static void _extract_crng(struct crng_state *crng,
  			  __u32 out[CHACHA20_BLOCK_WORDS]);
-@@ -932,7 +933,8 @@ static void _extract_crng(struct crng_st
+@@ -905,7 +906,8 @@ static void _extract_crng(struct crng_st
  	unsigned long v, flags;
  
  	if (crng_ready() &&
@@ -38,15 +38,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		crng_reseed(crng, crng == &primary_crng ? &input_pool : NULL);
  	spin_lock_irqsave(&crng->lock, flags);
  	if (arch_get_random_long(&v))
-@@ -1759,6 +1761,7 @@ static int rand_initialize(void)
+@@ -1738,6 +1740,7 @@ static int rand_initialize(void)
  	init_std_data(&input_pool);
  	init_std_data(&blocking_pool);
  	crng_initialize(&primary_crng);
 +	crng_global_init_time = jiffies;
- 	return 0;
- }
- early_initcall(rand_initialize);
-@@ -1932,6 +1935,14 @@ static long random_ioctl(struct file *f,
+ 
+ #ifdef CONFIG_NUMA
+ 	pool = kcalloc(nr_node_ids, sizeof(*pool), GFP_KERNEL|__GFP_NOFAIL);
+@@ -1924,6 +1927,14 @@ static long random_ioctl(struct file *f,
  		input_pool.entropy_count = 0;
  		blocking_pool.entropy_count = 0;
  		return 0;
diff --git a/queue-4.16/series b/queue-4.16/series
index f67bdcfc55f..74217362cbe 100644
--- a/queue-4.16/series
+++ b/queue-4.16/series
@@ -163,6 +163,7 @@ alsa-hda-realtek-adjust-the-location-of-one-mic.patch
 random-fix-crng_ready-test.patch
 random-use-a-different-mixing-algorithm-for-add_device_randomness.patch
 random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch
+random-add-new-ioctl-rndreseedcrng.patch
 hid-i2c-hid-fix-resume-issue-on-raydium-touchscreen-device.patch
 hid-input-fix-battery-level-reporting-on-bt-mice.patch
 hid-hidraw-fix-crash-on-hidiocgfeature-with-a-destroyed-device.patch