From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 27 May 2017 10:13:21 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.56~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5954bc000c7687683a9f8191de231d28e59acff5;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	revert-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch
---

diff --git a/queue-3.18/revert-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch b/queue-3.18/revert-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch
new file mode 100644
index 00000000000..003e88e101e
--- /dev/null
+++ b/queue-3.18/revert-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch
@@ -0,0 +1,41 @@
+From bc67a9f0ba89051916f192895317a0b5a431ad7e Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sat, 27 May 2017 12:09:37 +0200
+Subject: Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 609a3e81550b0b4ea87197b0f59455a7bcff975a which is
+commit 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 upstream.
+
+It shouldn't have been backported to 3.18, as we do not have
+get_random_long() in that kernel tree.
+
+Reported-by: Philip Müller <philm@manjaro.org>
+Cc: Daniel Micay <danielmicay@gmail.com>
+Cc: Arjan van de Ven <arjan@linux.intel.com>
+Cc: Rik van Riel <riel@redhat.com>
+Cc: 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
+Cc: 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
+@@ -338,7 +338,7 @@ static struct task_struct *dup_task_stru
+ 	set_task_stack_end_magic(tsk);
+ 
+ #ifdef CONFIG_CC_STACKPROTECTOR
+-	tsk->stack_canary = get_random_long();
++	tsk->stack_canary = get_random_int();
+ #endif
+ 
+ 	/*
diff --git a/queue-3.18/series b/queue-3.18/series
new file mode 100644
index 00000000000..ffbda860725
--- /dev/null
+++ b/queue-3.18/series
@@ -0,0 +1 @@
+revert-stackprotector-increase-the-per-task-stack-canary-s-random-range-from-32-bits-to-64-bits-on-64-bit-platforms.patch