Commit 1b84fc15 authored May 12, 2017 by Linus Torvalds

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

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

parents f1e0527d 5ea30e4e

kernel/fork.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

		/*

Admin message