History

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

Linus Torvalds committed 9 years ago

Commit 1b84fc12 parents f1e0527 5ea30e41 file · +1 −1Browse files

Unified · Split

kernel/fork.c+1−1
@@ -560,7 +560,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node) · 559 unmodified lines
560 set_task_stack_end_magic(tsk);560 set_task_stack_end_magic(tsk);
561 561
562#ifdef CONFIG_CC_STACKPROTECTOR562#ifdef CONFIG_CC_STACKPROTECTOR
563 tsk->stack_canary = get_random_int();563 tsk->stack_canary = get_random_long();
564#endif564#endif
565 565
566 /*566 /*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t