diff options
| author | Jeff Dike <jdike@addtoit.com> | 2005-07-29 23:03:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 00:01:14 +0200 |
| commit | a502a3593c7aa2aff99a61ed71e7cb828ee4da8b (patch) | |
| tree | 5960bb8522d9ce4c677233b0cdc5453bf8aef2f5 /arch/um/os-Linux/elf_aux.c | |
| parent | [PATCH] fbdev: Replace memcpy with for-loop when preparing bitmap (diff) | |
| download | linux-a502a3593c7aa2aff99a61ed71e7cb828ee4da8b.tar.xz linux-a502a3593c7aa2aff99a61ed71e7cb828ee4da8b.zip | |
[PATCH] uml: fix vsyscall brokenness
The #if/#ifdef cleanup exposed a bug in UML's ELF header processing. With
this bug fixed, UML recognizes the vsyscall info coming from the host. On
FC4, there is a vsyscall page low in the address space, which UML doesn't
provide. This causes an infinite page fault loop and a hang on boot.
This patch works around that by making this look like a no-vsyscall system.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/os-Linux/elf_aux.c')
| -rw-r--r-- | arch/um/os-Linux/elf_aux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index 5423b1ca17c4..9416e1c29926 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c @@ -9,9 +9,10 @@ */ #include <elf.h> #include <stddef.h> +#include <asm/elf.h> #include "init.h" #include "elf_user.h" -#include <asm/elf.h> +#include "mem_user.h" #if ELF_CLASS == ELFCLASS32 typedef Elf32_auxv_t elf_auxv_t; @@ -41,6 +42,9 @@ __init void scan_elf_aux( char **envp) break; case AT_SYSINFO_EHDR: vsyscall_ehdr = auxv->a_un.a_val; + /* See if the page is under TASK_SIZE */ + if (vsyscall_ehdr < (unsigned long) envp) + vsyscall_ehdr = 0; break; case AT_HWCAP: elf_aux_hwcap = auxv->a_un.a_val; |