1 files changed, 3 insertions, 0 deletions

diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
index 3a8d7e3aae0a..608784d4ec57 100644
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
@@ -39,6 +39,9 @@ __init void scan_elf_aux( char **envp)
                 switch ( auxv->a_type ) {
                         case AT_SYSINFO:
                                 __kernel_vsyscall = auxv->a_un.a_val;
+                                /* See if the page is under TASK_SIZE */
+                                if (__kernel_vsyscall < (unsigned long) envp)
+                                        __kernel_vsyscall = 0;
                                 break;
                         case AT_SYSINFO_EHDR:
                                 vsyscall_ehdr = auxv->a_un.a_val;