Index: vanilla-2.6.16-rc3/arch/i386/kernel/asm-offsets.c =================================================================== --- vanilla-2.6.16-rc3.orig/arch/i386/kernel/asm-offsets.c 2006-01-03 04:21:10.000000000 +0100 +++ vanilla-2.6.16-rc3/arch/i386/kernel/asm-offsets.c 2006-02-15 10:59:41.000000000 +0100 @@ -68,5 +68,5 @@ void foo(void) sizeof(struct tss_struct)); DEFINE(PAGE_SIZE_asm, PAGE_SIZE); - DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); + DEFINE(VSYSCALL_BASE, (PAGE_OFFSET - 2*PAGE_SIZE)); } Index: vanilla-2.6.16-rc3/arch/i386/kernel/sysenter.c =================================================================== --- vanilla-2.6.16-rc3.orig/arch/i386/kernel/sysenter.c 2006-01-03 04:21:10.000000000 +0100 +++ vanilla-2.6.16-rc3/arch/i386/kernel/sysenter.c 2006-02-13 09:57:36.000000000 +0100 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -45,23 +46,88 @@ void enable_sep_cpu(void) */ extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; +static void *syscall_page; int __init sysenter_setup(void) { - void *page = (void *)get_zeroed_page(GFP_ATOMIC); - - __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); + syscall_page = (void *)get_zeroed_page(GFP_ATOMIC); if (!boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, + memcpy(syscall_page, &vsyscall_int80_start, &vsyscall_int80_end - &vsyscall_int80_start); return 0; } - memcpy(page, + memcpy(syscall_page, &vsyscall_sysenter_start, &vsyscall_sysenter_end - &vsyscall_sysenter_start); return 0; } + +static struct page* +syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type) +{ + struct page *p = virt_to_page(adr - vma->vm_start + syscall_page); + get_page(p); + return p; +} + +/* Prevent VMA merging */ +static void syscall_vma_close(struct vm_area_struct *vma) +{ +} + +static struct vm_operations_struct syscall_vm_ops = { + .close = syscall_vma_close, + .nopage = syscall_nopage, +}; + +/* Setup a VMA at program startup for the vsyscall page */ +int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack) +{ + struct vm_area_struct *vma; + struct mm_struct *mm = current->mm; + int ret; + + vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); + if (!vma) + return -ENOMEM; + + memset(vma, 0, sizeof(struct vm_area_struct)); + /* Could randomize here */ + vma->vm_start = VSYSCALL_BASE; + vma->vm_end = VSYSCALL_BASE + PAGE_SIZE; + /* MAYWRITE to allow gdb to COW and set breakpoints */ + vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE; + vma->vm_flags |= mm->def_flags; + vma->vm_page_prot = protection_map[vma->vm_flags & 7]; + vma->vm_ops = &syscall_vm_ops; + vma->vm_mm = mm; + + down_write(&mm->mmap_sem); + if ((ret = insert_vm_struct(mm, vma))) { + up_write(&mm->mmap_sem); + kmem_cache_free(vm_area_cachep, vma); + return ret; + } + mm->total_vm++; + up_write(&mm->mmap_sem); + return 0; +} + +struct vm_area_struct *get_gate_vma(struct task_struct *tsk) +{ + return NULL; +} + +int in_gate_area(struct task_struct *task, unsigned long addr) +{ + return 0; +} + +int in_gate_area_no_task(unsigned long addr) +{ + return 0; +} Index: vanilla-2.6.16-rc3/include/asm-i386/a.out.h =================================================================== --- vanilla-2.6.16-rc3.orig/include/asm-i386/a.out.h 2006-01-03 04:21:10.000000000 +0100 +++ vanilla-2.6.16-rc3/include/asm-i386/a.out.h 2006-02-13 09:57:36.000000000 +0100 @@ -19,7 +19,7 @@ struct exec #ifdef __KERNEL__ -#define STACK_TOP TASK_SIZE +#define STACK_TOP (TASK_SIZE - 3*PAGE_SIZE) #endif Index: vanilla-2.6.16-rc3/include/asm-i386/elf.h =================================================================== --- vanilla-2.6.16-rc3.orig/include/asm-i386/elf.h 2006-01-03 04:21:10.000000000 +0100 +++ vanilla-2.6.16-rc3/include/asm-i386/elf.h 2006-02-13 09:57:36.000000000 +0100 @@ -129,11 +129,16 @@ extern int dump_task_extended_fpu (struc #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs) #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs) -#define VSYSCALL_BASE (__fix_to_virt(FIX_VSYSCALL)) +#define VSYSCALL_BASE (PAGE_OFFSET - 2*PAGE_SIZE) #define VSYSCALL_EHDR ((const struct elfhdr *) VSYSCALL_BASE) #define VSYSCALL_ENTRY ((unsigned long) &__kernel_vsyscall) extern void __kernel_vsyscall; +#define ARCH_HAS_SETUP_ADDITIONAL_PAGES +struct linux_binprm; +extern int arch_setup_additional_pages(struct linux_binprm *bprm, + int executable_stack); + #define ARCH_DLINFO \ do { \ NEW_AUX_ENT(AT_SYSINFO, VSYSCALL_ENTRY); \ Index: vanilla-2.6.16-rc3/include/asm-i386/fixmap.h =================================================================== --- vanilla-2.6.16-rc3.orig/include/asm-i386/fixmap.h 2006-01-03 04:21:10.000000000 +0100 +++ vanilla-2.6.16-rc3/include/asm-i386/fixmap.h 2006-02-14 14:40:15.000000000 +0100 @@ -52,7 +52,6 @@ */ enum fixed_addresses { FIX_HOLE, - FIX_VSYSCALL, #ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ #endif @@ -116,14 +115,6 @@ extern void __set_fixmap (enum fixed_add #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) -/* - * This is the range that is readable by user mode, and things - * acting like user mode such as get_user_pages. - */ -#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) -#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) - - extern void __this_fixmap_does_not_exist(void); /* Index: vanilla-2.6.16-rc3/include/asm-i386/page.h =================================================================== --- vanilla-2.6.16-rc3.orig/include/asm-i386/page.h 2006-02-13 09:42:02.000000000 +0100 +++ vanilla-2.6.16-rc3/include/asm-i386/page.h 2006-02-14 14:40:15.000000000 +0100 @@ -139,6 +139,8 @@ extern int page_is_ram(unsigned long pag ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define __HAVE_ARCH_GATE_AREA 1 + #endif /* __KERNEL__ */ #include Index: vanilla-2.6.16-rc3/include/asm-i386/processor.h =================================================================== --- vanilla-2.6.16-rc3.orig/include/asm-i386/processor.h 2006-02-13 09:42:02.000000000 +0100 +++ vanilla-2.6.16-rc3/include/asm-i386/processor.h 2006-02-14 14:43:25.000000000 +0100 @@ -318,7 +318,7 @@ extern int bootloader_type; /* * User space process size: 3GB (default). */ -#define TASK_SIZE (PAGE_OFFSET) +#define TASK_SIZE (PAGE_OFFSET - 3*PAGE_SIZE) /* This decides where the kernel will search for a free chunk of vm * space during mmap's.