diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-02-06 22:39:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-06 22:39:44 +0100 |
| commit | 32a932332c8bad842804842eaf9651ad6268e637 (patch) | |
| tree | 58f187409029f089f788c5c35ad5c200b4a555af /fs | |
| parent | 4cc6028d4040f95cdb590a87db478b42b8be0508 (diff) | |
| download | linux-3.10-32a932332c8bad842804842eaf9651ad6268e637.tar.gz linux-3.10-32a932332c8bad842804842eaf9651ad6268e637.tar.bz2 linux-3.10-32a932332c8bad842804842eaf9651ad6268e637.zip | |
brk randomization: introduce CONFIG_COMPAT_BRK
based on similar patch from: Pavel Machek <pavel@ucw.cz>
Introduce CONFIG_COMPAT_BRK. If disabled then the kernel is free
(but not obliged to) randomize the brk area.
Heap randomization breaks ancient binaries, so we keep COMPAT_BRK
enabled by default.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 4628c42ca89..111771d38e6 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1077,7 +1077,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) current->mm->start_stack = bprm->p; #ifdef arch_randomize_brk - if (current->flags & PF_RANDOMIZE) + if ((current->flags & PF_RANDOMIZE) && (randomize_va_space > 1)) current->mm->brk = current->mm->start_brk = arch_randomize_brk(current->mm); #endif |