diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-12 10:41:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-12 10:41:45 -0700 |
| commit | 1b84fc1503f24862d45eafb2e63da72b714da3fa (patch) | |
| tree | 6f00b63b21ea10b695481eeb732e169488f6fbcb | |
| parent | f1e0527d2db416dfdef9c55132fed7fa05910101 (diff) | |
| parent | 5ea30e4e58040cfd6434c2f33dc3ea76e2c15b05 (diff) | |
| download | linux-1b84fc1503f24862d45eafb2e63da72b714da3fa.tar.bz2 | |
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
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index bfd91b180778..06d759ab4c62 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 /* |