Commit 9bef4e33 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: fix binary layout assumption

This patch calculates section boundaries differently so as to not get
tripped up by holes in the binary such as are introduced by exec-shield.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 33bc8cec
...@@ -423,7 +423,7 @@ static void mprotect_kernel_mem(int w) ...@@ -423,7 +423,7 @@ static void mprotect_kernel_mem(int w)
protect_memory(start, end - start, 1, w, 1, 1); protect_memory(start, end - start, 1, w, 1, 1);
start = (unsigned long) UML_ROUND_DOWN(&__bss_start); start = (unsigned long) UML_ROUND_DOWN(&__bss_start);
end = (unsigned long) UML_ROUND_UP(&_end); end = (unsigned long) UML_ROUND_UP(brk_start);
protect_memory(start, end - start, 1, w, 1, 1); protect_memory(start, end - start, 1, w, 1, 1);
mprotect_kernel_vm(w); mprotect_kernel_vm(w);
......
...@@ -306,7 +306,7 @@ unsigned long end_iomem; ...@@ -306,7 +306,7 @@ unsigned long end_iomem;
int linux_main(int argc, char **argv) int linux_main(int argc, char **argv)
{ {
unsigned long avail; unsigned long avail, diff;
unsigned long virtmem_size, max_physmem; unsigned long virtmem_size, max_physmem;
unsigned int i, add; unsigned int i, add;
...@@ -324,6 +324,16 @@ int linux_main(int argc, char **argv) ...@@ -324,6 +324,16 @@ int linux_main(int argc, char **argv)
brk_start = (unsigned long) sbrk(0); brk_start = (unsigned long) sbrk(0);
CHOOSE_MODE_PROC(before_mem_tt, before_mem_skas, brk_start); CHOOSE_MODE_PROC(before_mem_tt, before_mem_skas, brk_start);
/* Increase physical memory size for exec-shield users
so they actually get what they asked for. This should
add zero for non-exec shield users */
diff = UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
if(diff > 1024 * 1024){
printf("Adding %ld bytes to physical memory to account for "
"exec-shield gap\n", diff);
physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
}
uml_physmem = uml_start; uml_physmem = uml_start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment