git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From bc67a9f0ba89051916f192895317a0b5a431ad7e Mon Sep 17 00:00:00 2001
   2 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   3 Date: Sat, 27 May 2017 12:09:37 +0200
   4 Subject: Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms"
   5
   6 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   7
   8 This reverts commit 609a3e81550b0b4ea87197b0f59455a7bcff975a which is
   9 commit 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 upstream.
  10
  11 It shouldn't have been backported to 3.18, as we do not have
  12 get_random_long() in that kernel tree.
  13
  14 Reported-by: Philip Müller <philm@manjaro.org>
  15 Cc: Daniel Micay <danielmicay@gmail.com>
  16 Cc: Arjan van de Ven <arjan@linux.intel.com>
  17 Cc: Rik van Riel <riel@redhat.com>
  18 Cc: Kees Cook <keescook@chromium.org>
  19 Cc: Arjan van Ven <arjan@linux.intel.com>
  20 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  21 Cc: Peter Zijlstra <peterz@infradead.org>
  22 Cc: Thomas Gleixner <tglx@linutronix.de>
  23 Cc: kernel-hardening@lists.openwall.com
  24 Cc: Ingo Molnar <mingo@kernel.org>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26
  27 ---
  28  kernel/fork.c |    2 +-
  29  1 file changed, 1 insertion(+), 1 deletion(-)
  30
  31 --- a/kernel/fork.c
  32 +++ b/kernel/fork.c
  33 @@ -338,7 +338,7 @@ static struct task_struct *dup_task_stru
  34         set_task_stack_end_magic(tsk);
  35
  36  #ifdef CONFIG_CC_STACKPROTECTOR
  37 -       tsk->stack_canary = get_random_long();
  38 +       tsk->stack_canary = get_random_int();
  39  #endif
  40
  41         /*