drop queue-4.4/stackprotector-increase-the-per-task-stack-canary-s-random-range-from...

diff --git a/queue-4.4/series b/queue-4.4/series
index bdd30661850a4fe454e7f1ac372d90a892ecff15..461a4bb04f466575d9da8d55dcc8549ba86af5a6 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -90,7 +90,6 @@ staging-rtl8192e-rtl92e_get_eeprom_size-fix-read-size-of-eprom_cmd.patch
 iommu-vt-d-flush-the-iotlb-to-get-rid-of-the-initial-kdump-mappings.patch
 metag-uaccess-fix-access_ok.patch
 metag-uaccess-check-access_ok-in-strncpy_from_user.patch
-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch
 uwb-fix-device-quirk-on-big-endian-hosts.patch
 genirq-fix-chained-interrupt-data-ordering.patch
 osf_wait4-fix-infoleak.patch

diff --git a/queue-4.4/stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch b/queue-4.4/stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch
deleted file mode 100644 (file)
index cbb596e..0000000
--- a/queue-4.4/stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 Mon Sep 17 00:00:00 2001
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Thu, 4 May 2017 09:32:09 -0400
-Subject: stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms
-
-From: Daniel Micay <danielmicay@gmail.com>
-
-commit 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 upstream.
-
-The stack canary is an 'unsigned long' and should be fully initialized to
-random data rather than only 32 bits of random data.
-
-Signed-off-by: Daniel Micay <danielmicay@gmail.com>
-Acked-by: Arjan van de Ven <arjan@linux.intel.com>
-Acked-by: Rik van Riel <riel@redhat.com>
-Acked-by: Kees Cook <keescook@chromium.org>
-Cc: Arjan van Ven <arjan@linux.intel.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: kernel-hardening@lists.openwall.com
-Link: http://lkml.kernel.org/r/20170504133209.3053-1-danielmicay@gmail.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/fork.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -368,7 +368,7 @@ static struct task_struct *dup_task_stru
-       set_task_stack_end_magic(tsk);
- 
- #ifdef CONFIG_CC_STACKPROTECTOR
--      tsk->stack_canary = get_random_int();
-+      tsk->stack_canary = get_random_long();
- #endif
- 
-       /*