Merge pull request #536 from wigyori/cc-sec

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 941-ocf_20120127.patch

diff --git a/target/linux/generic/patches-3.18/941-ocf_20120127.patch b/target/linux/generic/patches-3.18/941-ocf_20120127.patch
index e67cb04..ee36f1e 100644 (file)
--- a/target/linux/generic/patches-3.18/941-ocf_20120127.patch
+++ b/target/linux/generic/patches-3.18/941-ocf_20120127.patch
@@ -40,7 +40,7 @@
 + */
 +void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
 +{
-+      mix_pool_bytes(&input_pool, buf, wordcount*4, NULL);
++      mix_pool_bytes(&input_pool, buf, wordcount*4);
 +
 +      credit_entropy_bits(&input_pool, ent_count);
 +
@@ -50,7 +50,7 @@
 +       * Wake up waiting processes if we have enough
 +       * entropy.
 +       */
-+      if (input_pool.entropy_count >= random_read_wakeup_thresh)
++      if (input_pool.entropy_count >= random_read_wakeup_bits)
 +              wake_up_interruptible(&random_read_wait);
 +}
 +EXPORT_SYMBOL(random_input_words);
@@ -67,16 +67,16 @@
 +      int count;
 +
 +      wait_event_interruptible(random_write_wait, 
-+                       input_pool.entropy_count < random_write_wakeup_thresh);
++                       input_pool.entropy_count < random_write_wakeup_bits);
 +
-+      count = random_write_wakeup_thresh - input_pool.entropy_count;
++      count = random_write_wakeup_bits - input_pool.entropy_count;
 +
 +        /* likely we got woken up due to a signal */
-+      if (count <= 0) count = random_read_wakeup_thresh; 
++      if (count <= 0) count = random_read_wakeup_bits; 
 +
 +      pr_notice("requesting %d bits from input_wait()er %d<%d\n",
 +                count,
-+                input_pool.entropy_count, random_write_wakeup_thresh);
++                input_pool.entropy_count, random_write_wakeup_bits);
 +
 +      return count;
 +}
@@ -156,7 +156,7 @@
  void generate_random_uuid(unsigned char uuid_out[16]);
 --- a/kernel/pid.c
 +++ b/kernel/pid.c
-@@ -425,6 +425,7 @@ void transfer_pid(struct task_struct *ol
+@@ -427,6 +427,7 @@ void transfer_pid(struct task_struct *ol
        new->pids[type].pid = old->pids[type].pid;
        hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
  }