Convert /proc/device-tree/ to seq_file

[safe/jmp/linux-2.6] / fs / binfmt_elf_fdpic.c

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index f3e72c5..38502c6 100644 (file)
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -283,20 +283,23 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
        }
 
        stack_size = exec_params.stack_size;
-       if (stack_size < interp_params.stack_size)
-               stack_size = interp_params.stack_size;
-
        if (exec_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
                executable_stack = EXSTACK_ENABLE_X;
        else if (exec_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
                executable_stack = EXSTACK_DISABLE_X;
-       else if (interp_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
-               executable_stack = EXSTACK_ENABLE_X;
-       else if (interp_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
-               executable_stack = EXSTACK_DISABLE_X;
        else
                executable_stack = EXSTACK_DEFAULT;
 
+       if (stack_size == 0) {
+               stack_size = interp_params.stack_size;
+               if (interp_params.flags & ELF_FDPIC_FLAG_EXEC_STACK)
+                       executable_stack = EXSTACK_ENABLE_X;
+               else if (interp_params.flags & ELF_FDPIC_FLAG_NOEXEC_STACK)
+                       executable_stack = EXSTACK_DISABLE_X;
+               else
+                       executable_stack = EXSTACK_DEFAULT;
+       }
+
        retval = -ENOEXEC;
        if (stack_size == 0)
                goto error;
@@ -972,9 +975,12 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(
                        params->elfhdr_addr = seg->addr;
 
                /* clear any space allocated but not loaded */
-               if (phdr->p_filesz < phdr->p_memsz)
-                       clear_user((void *) (seg->addr + phdr->p_filesz),
-                                  phdr->p_memsz - phdr->p_filesz);
+               if (phdr->p_filesz < phdr->p_memsz) {
+                       ret = clear_user((void *) (seg->addr + phdr->p_filesz),
+                                        phdr->p_memsz - phdr->p_filesz);
+                       if (ret)
+                               return ret;
+               }
 
                if (mm) {
                        if (phdr->p_flags & PF_X) {
@@ -1014,7 +1020,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
        struct elf32_fdpic_loadseg *seg;
        struct elf32_phdr *phdr;
        unsigned long load_addr, delta_vaddr;
-       int loop, dvset;
+       int loop, dvset, ret;
 
        load_addr = params->load_addr;
        delta_vaddr = 0;
@@ -1114,7 +1120,9 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
                 * PT_LOAD */
                if (prot & PROT_WRITE && disp > 0) {
                        kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp);
-                       clear_user((void __user *) maddr, disp);
+                       ret = clear_user((void __user *) maddr, disp);
+                       if (ret)
+                               return ret;
                        maddr += disp;
                }
 
@@ -1149,15 +1157,19 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
                if (prot & PROT_WRITE && excess1 > 0) {
                        kdebug("clear[%d] ad=%lx sz=%lx",
                               loop, maddr + phdr->p_filesz, excess1);
-                       clear_user((void __user *) maddr + phdr->p_filesz,
-                                  excess1);
+                       ret = clear_user((void __user *) maddr + phdr->p_filesz,
+                                        excess1);
+                       if (ret)
+                               return ret;
                }
 
 #else
                if (excess > 0) {
                        kdebug("clear[%d] ad=%lx sz=%lx",
                               loop, maddr + phdr->p_filesz, excess);
-                       clear_user((void *) maddr + phdr->p_filesz, excess);
+                       ret = clear_user((void *) maddr + phdr->p_filesz, excess);
+                       if (ret)
+                               return ret;
                }
 #endif
 
@@ -1316,9 +1328,6 @@ static int writenote(struct memelfnote *men, struct file *file)
 #define DUMP_WRITE(addr, nr)   \
        if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
                goto end_coredump;
-#define DUMP_SEEK(off) \
-       if (!dump_seek(file, (off))) \
-               goto end_coredump;
 
 static inline void fill_elf_fdpic_header(struct elfhdr *elf, int segs)
 {
@@ -1378,8 +1387,10 @@ static void fill_prstatus(struct elf_prstatus *prstatus,
        prstatus->pr_info.si_signo = prstatus->pr_cursig = signr;
        prstatus->pr_sigpend = p->pending.signal.sig[0];
        prstatus->pr_sighold = p->blocked.sig[0];
+       rcu_read_lock();
+       prstatus->pr_ppid = task_pid_vnr(rcu_dereference(p->real_parent));
+       rcu_read_unlock();
        prstatus->pr_pid = task_pid_vnr(p);
-       prstatus->pr_ppid = task_pid_vnr(p->parent);
        prstatus->pr_pgrp = task_pgrp_vnr(p);
        prstatus->pr_sid = task_session_vnr(p);
        if (thread_group_leader(p)) {
@@ -1423,8 +1434,10 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
                        psinfo->pr_psargs[i] = ' ';
        psinfo->pr_psargs[len] = 0;
 
+       rcu_read_lock();
+       psinfo->pr_ppid = task_pid_vnr(rcu_dereference(p->real_parent));
+       rcu_read_unlock();
        psinfo->pr_pid = task_pid_vnr(p);
-       psinfo->pr_ppid = task_pid_vnr(p->parent);
        psinfo->pr_pgrp = task_pgrp_vnr(p);
        psinfo->pr_sid = task_session_vnr(p);
 
@@ -1505,6 +1518,7 @@ static int elf_fdpic_dump_segments(struct file *file, size_t *size,
                           unsigned long *limit, unsigned long mm_flags)
 {
        struct vm_area_struct *vma;
+       int err = 0;
 
        for (vma = current->mm->mmap; vma; vma = vma->vm_next) {
                unsigned long addr;
@@ -1512,43 +1526,26 @@ static int elf_fdpic_dump_segments(struct file *file, size_t *size,
                if (!maydump(vma, mm_flags))
                        continue;
 
-               for (addr = vma->vm_start;
-                    addr < vma->vm_end;
-                    addr += PAGE_SIZE
-                    ) {
-                       struct vm_area_struct *vma;
-                       struct page *page;
-
-                       if (get_user_pages(current, current->mm, addr, 1, 0, 1,
-                                          &page, &vma) <= 0) {
-                               DUMP_SEEK(file->f_pos + PAGE_SIZE);
-                       }
-                       else if (page == ZERO_PAGE(0)) {
-                               page_cache_release(page);
-                               DUMP_SEEK(file->f_pos + PAGE_SIZE);
-                       }
-                       else {
-                               void *kaddr;
-
-                               flush_cache_page(vma, addr, page_to_pfn(page));
-                               kaddr = kmap(page);
-                               if ((*size += PAGE_SIZE) > *limit ||
-                                   !dump_write(file, kaddr, PAGE_SIZE)
-                                   ) {
-                                       kunmap(page);
-                                       page_cache_release(page);
-                                       return -EIO;
-                               }
+               for (addr = vma->vm_start; addr < vma->vm_end;
+                                                       addr += PAGE_SIZE) {
+                       struct page *page = get_dump_page(addr);
+                       if (page) {
+                               void *kaddr = kmap(page);
+                               *size += PAGE_SIZE;
+                               if (*size > *limit)
+                                       err = -EFBIG;
+                               else if (!dump_write(file, kaddr, PAGE_SIZE))
+                                       err = -EIO;
                                kunmap(page);
                                page_cache_release(page);
-                       }
+                       } else if (!dump_seek(file, file->f_pos + PAGE_SIZE))
+                               err = -EFBIG;
+                       if (err)
+                               goto out;
                }
        }
-
-       return 0;
-
-end_coredump:
-       return -EFBIG;
+out:
+       return err;
 }
 #endif
 
@@ -1789,7 +1786,8 @@ static int elf_fdpic_core_dump(long signr, struct pt_regs *regs,
                                goto end_coredump;
        }
 
-       DUMP_SEEK(dataoff);
+       if (!dump_seek(file, dataoff))
+               goto end_coredump;
 
        if (elf_fdpic_dump_segments(file, &size, &limit, mm_flags) < 0)
                goto end_coredump;