diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-02-06 16:39:44 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-02-06 16:39:44 -0500 |
commit | 32a932332c8bad842804842eaf9651ad6268e637 (patch) | |
tree | 58f187409029f089f788c5c35ad5c200b4a555af /mm/memory.c | |
parent | 4cc6028d4040f95cdb590a87db478b42b8be0508 (diff) |
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 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 7bb70728bb52..9d073fa0a2d0 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -82,7 +82,18 @@ void * high_memory; | |||
82 | EXPORT_SYMBOL(num_physpages); | 82 | EXPORT_SYMBOL(num_physpages); |
83 | EXPORT_SYMBOL(high_memory); | 83 | EXPORT_SYMBOL(high_memory); |
84 | 84 | ||
85 | int randomize_va_space __read_mostly = 1; | 85 | /* |
86 | * Randomize the address space (stacks, mmaps, brk, etc.). | ||
87 | * | ||
88 | * ( When CONFIG_COMPAT_BRK=y we exclude brk from randomization, | ||
89 | * as ancient (libc5 based) binaries can segfault. ) | ||
90 | */ | ||
91 | int randomize_va_space __read_mostly = | ||
92 | #ifdef CONFIG_COMPAT_BRK | ||
93 | 1; | ||
94 | #else | ||
95 | 2; | ||
96 | #endif | ||
86 | 97 | ||
87 | static int __init disable_randmaps(char *s) | 98 | static int __init disable_randmaps(char *s) |
88 | { | 99 | { |