vserver 2.0-rc4

[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 fcd84c5..45a4ff7 100644 (file)
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -35,17 +35,20 @@ extern void ia64_elf32_init (struct pt_regs *regs);
 
 static void elf32_set_personality (void);
 
-#define setup_arg_pages(bprm,exec)             ia32_setup_arg_pages(bprm,exec)
+#define setup_arg_pages(bprm,tos,exec)         ia32_setup_arg_pages(bprm,exec)
 #define elf_map                                elf32_map
 
 #undef SET_PERSONALITY
 #define SET_PERSONALITY(ex, ibcs2)     elf32_set_personality()
 
+#define elf_read_implies_exec(ex, have_pt_gnu_stack)   (!(have_pt_gnu_stack))
+
 /* Ugly but avoids duplication */
 #include "../../../fs/binfmt_elf.c"
 
 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)
@@ -57,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)
 {
@@ -82,7 +100,38 @@ ia64_elf32_init (struct pt_regs *regs)
                vma->vm_ops = &ia32_shared_page_vm_ops;
                down_write(&current->mm->mmap_sem);
                {
-                       insert_vm_struct(current->mm, vma);
+                       if (insert_vm_struct(current->mm, vma)) {
+                               kmem_cache_free(vm_area_cachep, vma);
+                               up_write(&current->mm->mmap_sem);
+                               BUG();
+                       }
+               }
+               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);
+               {
+                       if (insert_vm_struct(current->mm, vma)) {
+                               kmem_cache_free(vm_area_cachep, vma);
+                               up_write(&current->mm->mmap_sem);
+                               BUG();
+                       }
                }
                up_write(&current->mm->mmap_sem);
        }
@@ -101,7 +150,11 @@ ia64_elf32_init (struct pt_regs *regs)
                vma->vm_flags = VM_READ|VM_WRITE|VM_MAYREAD|VM_MAYWRITE;
                down_write(&current->mm->mmap_sem);
                {
-                       insert_vm_struct(current->mm, vma);
+                       if (insert_vm_struct(current->mm, vma)) {
+                               kmem_cache_free(vm_area_cachep, vma);
+                               up_write(&current->mm->mmap_sem);
+                               BUG();
+                       }
                }
                up_write(&current->mm->mmap_sem);
        }
@@ -149,7 +202,7 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
        unsigned long stack_base, grow;
        struct vm_area_struct *mpnt;
        struct mm_struct *mm = current->mm;
-       int i;
+       int i, ret;
 
        stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
        mm->arg_start = bprm->p + stack_base;
@@ -186,10 +239,13 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
                        mpnt->vm_flags = VM_STACK_FLAGS;
                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));
+               if ((ret = insert_vm_struct(current->mm, mpnt))) {
+                       up_write(&current->mm->mmap_sem);
+                       kmem_cache_free(vm_area_cachep, mpnt);
+                       return ret;
+               }
+               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++) {
@@ -202,6 +258,10 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
        }
        up_write(&current->mm->mmap_sem);
 
+       /* Can't do it in ia64_elf32_init(). Needs to be done before calls to
+          elf32_map() */
+       current->thread.ppl = ia32_init_pp_list();
+
        return 0;
 }
 
@@ -211,7 +271,6 @@ elf32_set_personality (void)
        set_personality(PER_LINUX32);
        current->thread.map_base  = IA32_PAGE_OFFSET/3;
        current->thread.task_size = IA32_PAGE_OFFSET;   /* use what Linux/x86 uses... */
-       current->thread.flags |= IA64_THREAD_XSTACK;    /* data must be executable */
        set_fs(USER_DS);                                /* set addr limit for new TASK_SIZE */
 }