vserver 1.9.3

[linux-2.6.git] / arch / ia64 / ia32 / binfmt_elf32.c

diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index a6bc522..093129c 100644 (file)
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -14,7 +14,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/security.h>
-#include <linux/vs_memory.h>
 
 #include <asm/param.h>
 #include <asm/signal.h>
@@ -49,6 +48,7 @@ static void elf32_set_personality (void);
 
 extern struct page *ia32_shared_page[];
 extern unsigned long *ia32_gdt;
+extern struct page *ia32_gate_page;
 
 struct page *
 ia32_install_shared_page (struct vm_area_struct *vma, unsigned long address, int *type)
@@ -60,10 +60,25 @@ ia32_install_shared_page (struct vm_area_struct *vma, unsigned long address, int
        return pg;
 }
 
+struct page *
+ia32_install_gate_page (struct vm_area_struct *vma, unsigned long address, int *type)
+{
+       struct page *pg = ia32_gate_page;
+       get_page(pg);
+       if (type)
+               *type = VM_FAULT_MINOR;
+       return pg;
+}
+
+
 static struct vm_operations_struct ia32_shared_page_vm_ops = {
        .nopage = ia32_install_shared_page
 };
 
+static struct vm_operations_struct ia32_gate_page_vm_ops = {
+       .nopage = ia32_install_gate_page
+};
+
 void
 ia64_elf32_init (struct pt_regs *regs)
 {
@@ -90,6 +105,29 @@ ia64_elf32_init (struct pt_regs *regs)
                up_write(&current->mm->mmap_sem);
        }
 
+       /*
+        * When user stack is not executable, push sigreturn code to stack makes
+        * segmentation fault raised when returning to kernel. So now sigreturn
+        * code is locked in specific gate page, which is pointed by pretcode
+        * when setup_frame_ia32
+        */
+       vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+       if (vma) {
+               memset(vma, 0, sizeof(*vma));
+               vma->vm_mm = current->mm;
+               vma->vm_start = IA32_GATE_OFFSET;
+               vma->vm_end = vma->vm_start + PAGE_SIZE;
+               vma->vm_page_prot = PAGE_COPY_EXEC;
+               vma->vm_flags = VM_READ | VM_MAYREAD | VM_EXEC
+                               | VM_MAYEXEC | VM_RESERVED;
+               vma->vm_ops = &ia32_gate_page_vm_ops;
+               down_write(&current->mm->mmap_sem);
+               {
+                       insert_vm_struct(current->mm, vma);
+               }
+               up_write(&current->mm->mmap_sem);
+       }
+
        /*
         * Install LDT as anonymous memory.  This gives us all-zero segment descriptors
         * until a task modifies them via modify_ldt().
@@ -190,9 +228,9 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
                mpnt->vm_page_prot = (mpnt->vm_flags & VM_EXEC)?
                                        PAGE_COPY_EXEC: PAGE_COPY;
                insert_vm_struct(current->mm, mpnt);
-               // current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
-               vx_vmpages_sub(current->mm, current->mm->total_vm -
-                       ((mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT));
+               // current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
+               vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
+               current->mm->stack_vm = current->mm->total_vm;
        }
 
        for (i = 0 ; i < MAX_ARG_PAGES ; i++) {