Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

1b84fc15 · Linus Torvalds <[email protected]> · 2017-05-12 10:41:45 -07:00

Pull stackprotector fixlet from Ingo Molnar:
 "A single fix/enhancement to increase stackprotector canary randomness
  on 64-bit kernels with very little cost"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms

Commit: 1b84fc1503f24862d45eafb2e63da72b714da3fa
Parents: f1e0527d · 5ea30e4e

Merge commit. Changes below are compared with the first parent: f1e0527d.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/fork.c	modified	+1	−1	View file

kernel/fork.c

View file

diff --git a/kernel/fork.c b/kernel/fork.c
index bfd91b1..06d759a 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -560,7 +560,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
 	set_task_stack_end_magic(tsk);
 
 #ifdef CONFIG_CC_STACKPROTECTOR
-	tsk->stack_canary = get_random_int();
+	tsk->stack_canary = get_random_long();
 #endif
 
 	/*