diff options
| author | jdike <jdike> | 2004-02-16 00:11:29 +0000 |
|---|---|---|
| committer | jdike <jdike> | 2004-02-16 00:11:29 +0000 |
| commit | 0917a8ace8a6580c710dec56d11f42cad1e9f27f (patch) | |
| tree | b26789c833e47935f46c44098d956eb5e353328e | |
| parent | 49610130b9b40072c35955627f038fddf454ea07 (diff) | |
| download | uml-history-0917a8ace8a6580c710dec56d11f42cad1e9f27f.tar.gz | |
Changed one of the remap_data calls to go till &_end instead of brk_start to
fix some exec_shield wierdness.
| -rw-r--r-- | arch/um/kernel/tt/mem.c | 4 | ||||
| -rw-r--r-- | arch/um/kernel/tt/process_kern.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/tt/mem.c b/arch/um/kernel/tt/mem.c index 0c39b26..c38a653 100644 --- a/arch/um/kernel/tt/mem.c +++ b/arch/um/kernel/tt/mem.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) + * Copyright (C) 2002 - 2004 Jeff Dike (jdike@karaya.com) * Licensed under the GPL */ @@ -18,7 +18,7 @@ void before_mem_tt(unsigned long brk_start) if(!jail || debug) remap_data(UML_ROUND_DOWN(&_stext), UML_ROUND_UP(&_etext), 1); remap_data(UML_ROUND_DOWN(&_sdata), UML_ROUND_UP(&_edata), 1); - remap_data(UML_ROUND_DOWN(&__bss_start), UML_ROUND_UP(brk_start), 1); + remap_data(UML_ROUND_DOWN(&__bss_start), UML_ROUND_UP(&_end), 1); } #ifdef CONFIG_HOST_2G_2G diff --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c index cc0ee0c..dd8a55e 100644 --- a/arch/um/kernel/tt/process_kern.c +++ b/arch/um/kernel/tt/process_kern.c @@ -403,7 +403,7 @@ static void mprotect_kernel_mem(int w) protect_memory(start, end - start, 1, w, 1, 1); start = (unsigned long) UML_ROUND_DOWN(&__bss_start); - end = (unsigned long) UML_ROUND_UP(brk_start); + end = (unsigned long) UML_ROUND_UP(&_end); protect_memory(start, end - start, 1, w, 1, 1); mprotect_kernel_vm(w); |