[Bluetooth] Integrate services into the driver model
[pandora-kernel.git] / fs / binfmt_elf_fdpic.c
index eba4e23..2f33658 100644 (file)
@@ -1,6 +1,6 @@
 /* binfmt_elf_fdpic.c: FDPIC ELF binary format
  *
- * Copyright (C) 2003, 2004 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2003, 2004, 2006 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
  * Derived from binfmt_elf.c
  *
@@ -24,7 +24,9 @@
 #include <linux/file.h>
 #include <linux/fcntl.h>
 #include <linux/slab.h>
+#include <linux/pagemap.h>
 #include <linux/highmem.h>
+#include <linux/highuid.h>
 #include <linux/personality.h>
 #include <linux/ptrace.h>
 #include <linux/init.h>
@@ -48,45 +50,59 @@ typedef char *elf_caddr_t;
 #define kdebug(fmt, ...) do {} while(0)
 #endif
 
+#if 0
+#define kdcore(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ )
+#else
+#define kdcore(fmt, ...) do {} while(0)
+#endif
+
 MODULE_LICENSE("GPL");
 
-static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs);
-//static int load_elf_fdpic_library(struct file *);
-static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *file);
-static int elf_fdpic_map_file(struct elf_fdpic_params *params,
-                             struct file *file,
-                             struct mm_struct *mm,
-                             const char *what);
+static int load_elf_fdpic_binary(struct linux_binprm *, struct pt_regs *);
+static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *, struct file *);
+static int elf_fdpic_map_file(struct elf_fdpic_params *, struct file *,
+                             struct mm_struct *, const char *);
 
-static int create_elf_fdpic_tables(struct linux_binprm *bprm,
-                                  struct mm_struct *mm,
-                                  struct elf_fdpic_params *exec_params,
-                                  struct elf_fdpic_params *interp_params);
+static int create_elf_fdpic_tables(struct linux_binprm *, struct mm_struct *,
+                                  struct elf_fdpic_params *,
+                                  struct elf_fdpic_params *);
 
 #ifndef CONFIG_MMU
-static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm, unsigned long *_sp);
-static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *params,
-                                                  struct file *file,
-                                                  struct mm_struct *mm);
+static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *,
+                                           unsigned long *);
+static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *,
+                                                  struct file *,
+                                                  struct mm_struct *);
 #endif
 
-static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
-                                            struct file *file,
-                                            struct mm_struct *mm);
+static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *,
+                                            struct file *, struct mm_struct *);
+
+#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+static int elf_fdpic_core_dump(long, struct pt_regs *, struct file *);
+#endif
 
 static struct linux_binfmt elf_fdpic_format = {
        .module         = THIS_MODULE,
        .load_binary    = load_elf_fdpic_binary,
-//     .load_shlib     = load_elf_fdpic_library,
-//     .core_dump      = elf_fdpic_core_dump,
+#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+       .core_dump      = elf_fdpic_core_dump,
+#endif
        .min_coredump   = ELF_EXEC_PAGESIZE,
 };
 
-static int __init init_elf_fdpic_binfmt(void)  { return register_binfmt(&elf_fdpic_format); }
-static void __exit exit_elf_fdpic_binfmt(void) { unregister_binfmt(&elf_fdpic_format); }
+static int __init init_elf_fdpic_binfmt(void)
+{
+       return register_binfmt(&elf_fdpic_format);
+}
+
+static void __exit exit_elf_fdpic_binfmt(void)
+{
+       unregister_binfmt(&elf_fdpic_format);
+}
 
-module_init(init_elf_fdpic_binfmt)
-module_exit(exit_elf_fdpic_binfmt)
+core_initcall(init_elf_fdpic_binfmt);
+module_exit(exit_elf_fdpic_binfmt);
 
 static int is_elf_fdpic(struct elfhdr *hdr, struct file *file)
 {
@@ -105,7 +121,8 @@ static int is_elf_fdpic(struct elfhdr *hdr, struct file *file)
 /*
  * read the program headers table into memory
  */
-static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *file)
+static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params,
+                                struct file *file)
 {
        struct elf32_phdr *phdr;
        unsigned long size;
@@ -121,7 +138,8 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *f
        if (!params->phdrs)
                return -ENOMEM;
 
-       retval = kernel_read(file, params->hdr.e_phoff, (char *) params->phdrs, size);
+       retval = kernel_read(file, params->hdr.e_phoff,
+                            (char *) params->phdrs, size);
        if (retval < 0)
                return retval;
 
@@ -141,17 +159,24 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, struct file *f
        }
 
        return 0;
-} /* end elf_fdpic_fetch_phdrs() */
+}
 
 /*****************************************************************************/
 /*
  * load an fdpic binary into various bits of memory
  */
-static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+static int load_elf_fdpic_binary(struct linux_binprm *bprm,
+                                struct pt_regs *regs)
 {
        struct elf_fdpic_params exec_params, interp_params;
        struct elf_phdr *phdr;
-       unsigned long stack_size;
+       unsigned long stack_size, entryaddr;
+#ifndef CONFIG_MMU
+       unsigned long fullsize;
+#endif
+#ifdef ELF_FDPIC_PLAT_INIT
+       unsigned long dynaddr;
+#endif
        struct file *interpreter = NULL; /* to shut gcc up */
        char *interpreter_name = NULL;
        int executable_stack;
@@ -212,7 +237,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs
                                goto error;
                        }
 
-                       retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
+                       retval = kernel_read(interpreter, 0, bprm->buf,
+                                            BINPRM_BUF_SIZE);
                        if (retval < 0)
                                goto error;
 
@@ -295,7 +321,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs
                                  &current->mm->start_stack,
                                  &current->mm->start_brk);
 
-       retval = setup_arg_pages(bprm, current->mm->start_stack, executable_stack);
+       retval = setup_arg_pages(bprm, current->mm->start_stack,
+                                executable_stack);
        if (retval < 0) {
                send_sig(SIGKILL, current, 0);
                goto error_kill;
@@ -303,7 +330,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs
 #endif
 
        /* load the executable and interpreter into memory */
-       retval = elf_fdpic_map_file(&exec_params, bprm->file, current->mm, "executable");
+       retval = elf_fdpic_map_file(&exec_params, bprm->file, current->mm,
+                                   "executable");
        if (retval < 0)
                goto error_kill;
 
@@ -324,7 +352,8 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs
        if (!current->mm->start_brk)
                current->mm->start_brk = current->mm->end_data;
 
-       current->mm->brk = current->mm->start_brk = PAGE_ALIGN(current->mm->start_brk);
+       current->mm->brk = current->mm->start_brk =
+               PAGE_ALIGN(current->mm->start_brk);
 
 #else
        /* create a stack and brk area big enough for everyone
@@ -336,47 +365,45 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs
                stack_size = PAGE_SIZE * 2;
 
        down_write(&current->mm->mmap_sem);
-       current->mm->start_brk = do_mmap(NULL,
-                                        0,
-                                        stack_size,
+       current->mm->start_brk = do_mmap(NULL, 0, stack_size,
                                         PROT_READ | PROT_WRITE | PROT_EXEC,
                                         MAP_PRIVATE | MAP_ANON | MAP_GROWSDOWN,
                                         0);
 
-       if (IS_ERR((void *) current->mm->start_brk)) {
+       if (IS_ERR_VALUE(current->mm->start_brk)) {
                up_write(&current->mm->mmap_sem);
                retval = current->mm->start_brk;
                current->mm->start_brk = 0;
                goto error_kill;
        }
 
-       if (do_mremap(current->mm->start_brk,
-                     stack_size,
-                     ksize((char *) current->mm->start_brk),
-                     0, 0
-                     ) == current->mm->start_brk
-           )
-               stack_size = ksize((char *) current->mm->start_brk);
+       /* expand the stack mapping to use up the entire allocation granule */
+       fullsize = ksize((char *) current->mm->start_brk);
+       if (!IS_ERR_VALUE(do_mremap(current->mm->start_brk, stack_size,
+                                   fullsize, 0, 0)))
+               stack_size = fullsize;
        up_write(&current->mm->mmap_sem);
 
        current->mm->brk = current->mm->start_brk;
        current->mm->context.end_brk = current->mm->start_brk;
-       current->mm->context.end_brk += (stack_size > PAGE_SIZE) ? (stack_size - PAGE_SIZE) : 0;
+       current->mm->context.end_brk +=
+               (stack_size > PAGE_SIZE) ? (stack_size - PAGE_SIZE) : 0;
        current->mm->start_stack = current->mm->start_brk + stack_size;
 #endif
 
        compute_creds(bprm);
        current->flags &= ~PF_FORKNOEXEC;
-       if (create_elf_fdpic_tables(bprm, current->mm, &exec_params, &interp_params) < 0)
+       if (create_elf_fdpic_tables(bprm, current->mm,
+                                   &exec_params, &interp_params) < 0)
                goto error_kill;
 
-       kdebug("- start_code  %lx",     (long) current->mm->start_code);
-       kdebug("- end_code    %lx",     (long) current->mm->end_code);
-       kdebug("- start_data  %lx",     (long) current->mm->start_data);
-       kdebug("- end_data    %lx",     (long) current->mm->end_data);
-       kdebug("- start_brk   %lx",     (long) current->mm->start_brk);
-       kdebug("- brk         %lx",     (long) current->mm->brk);
-       kdebug("- start_stack %lx",     (long) current->mm->start_stack);
+       kdebug("- start_code  %lx", current->mm->start_code);
+       kdebug("- end_code    %lx", current->mm->end_code);
+       kdebug("- start_data  %lx", current->mm->start_data);
+       kdebug("- end_data    %lx", current->mm->end_data);
+       kdebug("- start_brk   %lx", current->mm->start_brk);
+       kdebug("- brk         %lx", current->mm->brk);
+       kdebug("- start_stack %lx", current->mm->start_stack);
 
 #ifdef ELF_FDPIC_PLAT_INIT
        /*
@@ -385,21 +412,18 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, struct pt_regs *regs
         * example.  This macro performs whatever initialization to
         * the regs structure is required.
         */
-       ELF_FDPIC_PLAT_INIT(regs,
-                           exec_params.map_addr,
-                           interp_params.map_addr,
-                           interp_params.dynamic_addr ?: exec_params.dynamic_addr
-                           );
+       dynaddr = interp_params.dynamic_addr ?: exec_params.dynamic_addr;
+       ELF_FDPIC_PLAT_INIT(regs, exec_params.map_addr, interp_params.map_addr,
+                           dynaddr);
 #endif
 
        /* everything is now ready... get the userspace context ready to roll */
-       start_thread(regs,
-                    interp_params.entry_addr ?: exec_params.entry_addr,
-                    current->mm->start_stack);
+       entryaddr = interp_params.entry_addr ?: exec_params.entry_addr;
+       start_thread(regs, entryaddr, current->mm->start_stack);
 
        if (unlikely(current->ptrace & PT_PTRACED)) {
                if (current->ptrace & PT_TRACE_EXEC)
-                       ptrace_notify ((PTRACE_EVENT_EXEC << 8) | SIGTRAP);
+                       ptrace_notify((PTRACE_EVENT_EXEC << 8) | SIGTRAP);
                else
                        send_sig(SIGTRAP, current, 0);
        }
@@ -419,11 +443,11 @@ error:
        return retval;
 
        /* unrecoverable error - kill the process */
- error_kill:
+error_kill:
        send_sig(SIGSEGV, current, 0);
        goto error;
 
-} /* end load_elf_fdpic_binary() */
+}
 
 /*****************************************************************************/
 /*
@@ -459,6 +483,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
         */
        hwcap = ELF_HWCAP;
        k_platform = ELF_PLATFORM;
+       u_platform = NULL;
 
        if (k_platform) {
                platform_len = strlen(k_platform) + 1;
@@ -470,11 +495,11 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
 
 #if defined(__i386__) && defined(CONFIG_SMP)
        /* in some cases (e.g. Hyper-Threading), we want to avoid L1 evictions
-        * by the processes running on the same package. One thing we can do
-        * is to shuffle the initial stack for them.
+        * by the processes running on the same package. One thing we can do is
+        * to shuffle the initial stack for them.
         *
-        * the conditionals here are unneeded, but kept in to make the
-        * code behaviour the same as pre change unless we have hyperthreaded
+        * the conditionals here are unneeded, but kept in to make the code
+        * behaviour the same as pre change unless we have hyperthreaded
         * processors. This keeps Mr Marcelo Person happier but should be
         * removed for 2.5
         */
@@ -497,11 +522,13 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
 
        if (interp_params->loadmap) {
                len = sizeof(struct elf32_fdpic_loadmap);
-               len += sizeof(struct elf32_fdpic_loadseg) * interp_params->loadmap->nsegs;
+               len += sizeof(struct elf32_fdpic_loadseg) *
+                       interp_params->loadmap->nsegs;
                sp = (sp - len) & ~7UL;
                interp_params->map_addr = sp;
 
-               if (copy_to_user((void __user *) sp, interp_params->loadmap, len) != 0)
+               if (copy_to_user((void __user *) sp, interp_params->loadmap,
+                                len) != 0)
                        return -EFAULT;
 
                current->mm->context.interp_fdpic_loadmap = (unsigned long) sp;
@@ -525,34 +552,37 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
        sp -= sp & 15UL;
 
        /* put the ELF interpreter info on the stack */
-#define NEW_AUX_ENT(nr, id, val)                                               \
-       do {                                                                    \
-               struct { unsigned long _id, _val; } __user *ent = (void __user *) csp;  \
-               __put_user((id), &ent[nr]._id);                                 \
-               __put_user((val), &ent[nr]._val);                               \
+#define NEW_AUX_ENT(nr, id, val)                                       \
+       do {                                                            \
+               struct { unsigned long _id, _val; } __user *ent;        \
+                                                                       \
+               ent = (void __user *) csp;                              \
+               __put_user((id), &ent[nr]._id);                         \
+               __put_user((val), &ent[nr]._val);                       \
        } while (0)
 
        csp -= 2 * sizeof(unsigned long);
        NEW_AUX_ENT(0, AT_NULL, 0);
        if (k_platform) {
                csp -= 2 * sizeof(unsigned long);
-               NEW_AUX_ENT(0, AT_PLATFORM, (elf_addr_t)(unsigned long) u_platform);
+               NEW_AUX_ENT(0, AT_PLATFORM,
+                           (elf_addr_t) (unsigned long) u_platform);
        }
 
        csp -= DLINFO_ITEMS * 2 * sizeof(unsigned long);
-       NEW_AUX_ENT( 0, AT_HWCAP,               hwcap);
-       NEW_AUX_ENT( 1, AT_PAGESZ,              PAGE_SIZE);
-       NEW_AUX_ENT( 2, AT_CLKTCK,              CLOCKS_PER_SEC);
-       NEW_AUX_ENT( 3, AT_PHDR,                exec_params->ph_addr);
-       NEW_AUX_ENT( 4, AT_PHENT,               sizeof(struct elf_phdr));
-       NEW_AUX_ENT( 5, AT_PHNUM,               exec_params->hdr.e_phnum);
-       NEW_AUX_ENT( 6, AT_BASE,                interp_params->elfhdr_addr);
-       NEW_AUX_ENT( 7, AT_FLAGS,               0);
-       NEW_AUX_ENT( 8, AT_ENTRY,               exec_params->entry_addr);
-       NEW_AUX_ENT( 9, AT_UID,                 (elf_addr_t) current->uid);
-       NEW_AUX_ENT(10, AT_EUID,                (elf_addr_t) current->euid);
-       NEW_AUX_ENT(11, AT_GID,                 (elf_addr_t) current->gid);
-       NEW_AUX_ENT(12, AT_EGID,                (elf_addr_t) current->egid);
+       NEW_AUX_ENT( 0, AT_HWCAP,       hwcap);
+       NEW_AUX_ENT( 1, AT_PAGESZ,      PAGE_SIZE);
+       NEW_AUX_ENT( 2, AT_CLKTCK,      CLOCKS_PER_SEC);
+       NEW_AUX_ENT( 3, AT_PHDR,        exec_params->ph_addr);
+       NEW_AUX_ENT( 4, AT_PHENT,       sizeof(struct elf_phdr));
+       NEW_AUX_ENT( 5, AT_PHNUM,       exec_params->hdr.e_phnum);
+       NEW_AUX_ENT( 6, AT_BASE,        interp_params->elfhdr_addr);
+       NEW_AUX_ENT( 7, AT_FLAGS,       0);
+       NEW_AUX_ENT( 8, AT_ENTRY,       exec_params->entry_addr);
+       NEW_AUX_ENT( 9, AT_UID,         (elf_addr_t) current->uid);
+       NEW_AUX_ENT(10, AT_EUID,        (elf_addr_t) current->euid);
+       NEW_AUX_ENT(11, AT_GID,         (elf_addr_t) current->gid);
+       NEW_AUX_ENT(12, AT_EGID,        (elf_addr_t) current->egid);
 
 #ifdef ARCH_DLINFO
        /* ARCH_DLINFO must come last so platform specific code can enforce
@@ -578,7 +608,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
 #ifdef CONFIG_MMU
        current->mm->arg_start = bprm->p;
 #else
-       current->mm->arg_start = current->mm->start_stack - (MAX_ARG_PAGES * PAGE_SIZE - bprm->p);
+       current->mm->arg_start = current->mm->start_stack -
+               (MAX_ARG_PAGES * PAGE_SIZE - bprm->p);
 #endif
 
        p = (char __user *) current->mm->arg_start;
@@ -606,7 +637,7 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
 
        mm->start_stack = (unsigned long) sp;
        return 0;
-} /* end create_elf_fdpic_tables() */
+}
 
 /*****************************************************************************/
 /*
@@ -614,7 +645,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,
  * the stack
  */
 #ifndef CONFIG_MMU
-static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm, unsigned long *_sp)
+static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm,
+                                           unsigned long *_sp)
 {
        unsigned long index, stop, sp;
        char *src;
@@ -635,9 +667,9 @@ static int elf_fdpic_transfer_args_to_stack(struct linux_binprm *bprm, unsigned
 
        *_sp = (*_sp - (MAX_ARG_PAGES * PAGE_SIZE - bprm->p)) & ~15;
 
- out:
+out:
        return ret;
-} /* end elf_fdpic_transfer_args_to_stack() */
+}
 #endif
 
 /*****************************************************************************/
@@ -712,17 +744,18 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
                seg = loadmap->segs;
                for (loop = loadmap->nsegs; loop > 0; loop--, seg++) {
                        if (params->hdr.e_entry >= seg->p_vaddr &&
-                           params->hdr.e_entry < seg->p_vaddr + seg->p_memsz
-                           ) {
+                           params->hdr.e_entry < seg->p_vaddr + seg->p_memsz) {
                                params->entry_addr =
-                                       (params->hdr.e_entry - seg->p_vaddr) + seg->addr;
+                                       (params->hdr.e_entry - seg->p_vaddr) +
+                                       seg->addr;
                                break;
                        }
                }
        }
 
        /* determine where the program header table has wound up if mapped */
-       stop = params->hdr.e_phoff + params->hdr.e_phnum * sizeof (struct elf_phdr);
+       stop = params->hdr.e_phoff;
+       stop += params->hdr.e_phnum * sizeof (struct elf_phdr);
        phdr = params->phdrs;
 
        for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
@@ -736,9 +769,11 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
                seg = loadmap->segs;
                for (loop = loadmap->nsegs; loop > 0; loop--, seg++) {
                        if (phdr->p_vaddr >= seg->p_vaddr &&
-                           phdr->p_vaddr + phdr->p_filesz <= seg->p_vaddr + seg->p_memsz
-                           ) {
-                               params->ph_addr = (phdr->p_vaddr - seg->p_vaddr) + seg->addr +
+                           phdr->p_vaddr + phdr->p_filesz <=
+                           seg->p_vaddr + seg->p_memsz) {
+                               params->ph_addr =
+                                       (phdr->p_vaddr - seg->p_vaddr) +
+                                       seg->addr +
                                        params->hdr.e_phoff - phdr->p_offset;
                                break;
                        }
@@ -755,18 +790,22 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
                seg = loadmap->segs;
                for (loop = loadmap->nsegs; loop > 0; loop--, seg++) {
                        if (phdr->p_vaddr >= seg->p_vaddr &&
-                           phdr->p_vaddr + phdr->p_memsz <= seg->p_vaddr + seg->p_memsz
-                           ) {
-                               params->dynamic_addr = (phdr->p_vaddr - seg->p_vaddr) + seg->addr;
-
-                               /* check the dynamic section contains at least one item, and that
-                                * the last item is a NULL entry */
+                           phdr->p_vaddr + phdr->p_memsz <=
+                           seg->p_vaddr + seg->p_memsz) {
+                               params->dynamic_addr =
+                                       (phdr->p_vaddr - seg->p_vaddr) +
+                                       seg->addr;
+
+                               /* check the dynamic section contains at least
+                                * one item, and that the last item is a NULL
+                                * entry */
                                if (phdr->p_memsz == 0 ||
                                    phdr->p_memsz % sizeof(Elf32_Dyn) != 0)
                                        goto dynamic_error;
 
                                tmp = phdr->p_memsz / sizeof(Elf32_Dyn);
-                               if (((Elf32_Dyn *) params->dynamic_addr)[tmp - 1].d_tag != 0)
+                               if (((Elf32_Dyn *)
+                                    params->dynamic_addr)[tmp - 1].d_tag != 0)
                                        goto dynamic_error;
                                break;
                        }
@@ -775,8 +814,8 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
        }
 
        /* now elide adjacent segments in the load map on MMU linux
-        * - on uClinux the holes between may actually be filled with system stuff or stuff from
-        *   other processes
+        * - on uClinux the holes between may actually be filled with system
+        *   stuff or stuff from other processes
         */
 #ifdef CONFIG_MMU
        nloads = loadmap->nsegs;
@@ -787,7 +826,9 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
                if (seg->p_vaddr - mseg->p_vaddr == seg->addr - mseg->addr) {
                        load_addr = PAGE_ALIGN(mseg->addr + mseg->p_memsz);
                        if (load_addr == (seg->addr & PAGE_MASK)) {
-                               mseg->p_memsz += load_addr - (mseg->addr + mseg->p_memsz);
+                               mseg->p_memsz +=
+                                       load_addr -
+                                       (mseg->addr + mseg->p_memsz);
                                mseg->p_memsz += seg->addr & ~PAGE_MASK;
                                mseg->p_memsz += seg->p_memsz;
                                loadmap->nsegs--;
@@ -815,20 +856,21 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
 
        return 0;
 
- dynamic_error:
+dynamic_error:
        printk("ELF FDPIC %s with invalid DYNAMIC section (inode=%lu)\n",
               what, file->f_dentry->d_inode->i_ino);
        return -ELIBBAD;
-} /* end elf_fdpic_map_file() */
+}
 
 /*****************************************************************************/
 /*
  * map a file with constant displacement under uClinux
  */
 #ifndef CONFIG_MMU
-static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *params,
-                                                  struct file *file,
-                                                  struct mm_struct *mm)
+static int elf_fdpic_map_file_constdisp_on_uclinux(
+       struct elf_fdpic_params *params,
+       struct file *file,
+       struct mm_struct *mm)
 {
        struct elf32_fdpic_loadseg *seg;
        struct elf32_phdr *phdr;
@@ -839,7 +881,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para
        load_addr = params->load_addr;
        seg = params->loadmap->segs;
 
-       /* determine the bounds of the contiguous overall allocation we must make */
+       /* determine the bounds of the contiguous overall allocation we must
+        * make */
        phdr = params->phdrs;
        for (loop = 0; loop < params->hdr.e_phnum; loop++, phdr++) {
                if (params->phdrs[loop].p_type != PT_LOAD)
@@ -860,7 +903,7 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para
        maddr = do_mmap(NULL, load_addr, top - base,
                        PROT_READ | PROT_WRITE | PROT_EXEC, mflags, 0);
        up_write(&mm->mmap_sem);
-       if (IS_ERR((void *) maddr))
+       if (IS_ERR_VALUE(maddr))
                return (int) maddr;
 
        if (load_addr != 0)
@@ -878,7 +921,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para
                seg->p_vaddr = phdr->p_vaddr;
                seg->p_memsz = phdr->p_memsz;
 
-               ret = file->f_op->read(file, (void *) seg->addr, phdr->p_filesz, &fpos);
+               ret = file->f_op->read(file, (void *) seg->addr,
+                                      phdr->p_filesz, &fpos);
                if (ret < 0)
                        return ret;
 
@@ -895,8 +939,7 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para
                        if (phdr->p_flags & PF_X) {
                                mm->start_code = seg->addr;
                                mm->end_code = seg->addr + phdr->p_memsz;
-                       }
-                       else if (!mm->start_data) {
+                       } else if (!mm->start_data) {
                                mm->start_data = seg->addr;
 #ifndef CONFIG_MMU
                                mm->end_data = seg->addr + phdr->p_memsz;
@@ -913,7 +956,7 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(struct elf_fdpic_params *para
        }
 
        return 0;
-} /* end elf_fdpic_map_file_constdisp_on_uclinux() */
+}
 #endif
 
 /*****************************************************************************/
@@ -974,14 +1017,14 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
 
                case ELF_FDPIC_FLAG_CONSTDISP:
                        /* constant displacement
-                        * - can be mapped anywhere, but must be mapped as a unit
+                        * - can be mapped anywhere, but must be mapped as a
+                        *   unit
                         */
                        if (!dvset) {
                                maddr = load_addr;
                                delta_vaddr = phdr->p_vaddr;
                                dvset = 1;
-                       }
-                       else {
+                       } else {
                                maddr = load_addr + phdr->p_vaddr - delta_vaddr;
                                flags |= MAP_FIXED;
                        }
@@ -1005,13 +1048,14 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
                up_write(&mm->mmap_sem);
 
                kdebug("mmap[%d] <file> sz=%lx pr=%x fl=%x of=%lx --> %08lx",
-                      loop, phdr->p_memsz + disp, prot, flags, phdr->p_offset - disp,
-                      maddr);
+                      loop, phdr->p_memsz + disp, prot, flags,
+                      phdr->p_offset - disp, maddr);
 
-               if (IS_ERR((void *) maddr))
+               if (IS_ERR_VALUE(maddr))
                        return (int) maddr;
 
-               if ((params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) == ELF_FDPIC_FLAG_CONTIGUOUS)
+               if ((params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) ==
+                   ELF_FDPIC_FLAG_CONTIGUOUS)
                        load_addr += PAGE_ALIGN(phdr->p_memsz + disp);
 
                seg->addr = maddr + disp;
@@ -1022,7 +1066,8 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
                if (phdr->p_offset == 0)
                        params->elfhdr_addr = seg->addr;
 
-               /* clear the bit between beginning of mapping and beginning of PT_LOAD */
+               /* clear the bit between beginning of mapping and beginning of
+                * PT_LOAD */
                if (prot & PROT_WRITE && disp > 0) {
                        kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp);
                        clear_user((void __user *) maddr, disp);
@@ -1038,19 +1083,20 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
                excess1 = PAGE_SIZE - ((maddr + phdr->p_filesz) & ~PAGE_MASK);
 
 #ifdef CONFIG_MMU
-
                if (excess > excess1) {
                        unsigned long xaddr = maddr + phdr->p_filesz + excess1;
                        unsigned long xmaddr;
 
                        flags |= MAP_FIXED | MAP_ANONYMOUS;
                        down_write(&mm->mmap_sem);
-                       xmaddr = do_mmap(NULL, xaddr, excess - excess1, prot, flags, 0);
+                       xmaddr = do_mmap(NULL, xaddr, excess - excess1,
+                                        prot, flags, 0);
                        up_write(&mm->mmap_sem);
 
                        kdebug("mmap[%d] <anon>"
                               " ad=%lx sz=%lx pr=%x fl=%x of=0 --> %08lx",
-                              loop, xaddr, excess - excess1, prot, flags, xmaddr);
+                              loop, xaddr, excess - excess1, prot, flags,
+                              xmaddr);
 
                        if (xmaddr != xaddr)
                                return -ENOMEM;
@@ -1059,7 +1105,8 @@ 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);
+                       clear_user((void __user *) maddr + phdr->p_filesz,
+                                  excess1);
                }
 
 #else
@@ -1074,8 +1121,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
                        if (phdr->p_flags & PF_X) {
                                mm->start_code = maddr;
                                mm->end_code = maddr + phdr->p_memsz;
-                       }
-                       else if (!mm->start_data) {
+                       } else if (!mm->start_data) {
                                mm->start_data = maddr;
                                mm->end_data = maddr + phdr->p_memsz;
                        }
@@ -1085,4 +1131,662 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params,
        }
 
        return 0;
-} /* end elf_fdpic_map_file_by_direct_mmap() */
+}
+
+/*****************************************************************************/
+/*
+ * ELF-FDPIC core dumper
+ *
+ * Modelled on fs/exec.c:aout_core_dump()
+ * Jeremy Fitzhardinge <jeremy@sw.oz.au>
+ *
+ * Modelled on fs/binfmt_elf.c core dumper
+ */
+#if defined(USE_ELF_CORE_DUMP) && defined(CONFIG_ELF_CORE)
+
+/*
+ * These are the only things you should do on a core-file: use only these
+ * functions to write out all the necessary info.
+ */
+static int dump_write(struct file *file, const void *addr, int nr)
+{
+       return file->f_op->write(file, addr, nr, &file->f_pos) == nr;
+}
+
+static int dump_seek(struct file *file, loff_t off)
+{
+       if (file->f_op->llseek) {
+               if (file->f_op->llseek(file, off, SEEK_SET) != off)
+                       return 0;
+       } else {
+               file->f_pos = off;
+       }
+       return 1;
+}
+
+/*
+ * Decide whether a segment is worth dumping; default is yes to be
+ * sure (missing info is worse than too much; etc).
+ * Personally I'd include everything, and use the coredump limit...
+ *
+ * I think we should skip something. But I am not sure how. H.J.
+ */
+static int maydump(struct vm_area_struct *vma)
+{
+       /* Do not dump I/O mapped devices or special mappings */
+       if (vma->vm_flags & (VM_IO | VM_RESERVED)) {
+               kdcore("%08lx: %08lx: no (IO)", vma->vm_start, vma->vm_flags);
+               return 0;
+       }
+
+       /* If we may not read the contents, don't allow us to dump
+        * them either. "dump_write()" can't handle it anyway.
+        */
+       if (!(vma->vm_flags & VM_READ)) {
+               kdcore("%08lx: %08lx: no (!read)", vma->vm_start, vma->vm_flags);
+               return 0;
+       }
+
+       /* Dump shared memory only if mapped from an anonymous file. */
+       if (vma->vm_flags & VM_SHARED) {
+               if (vma->vm_file->f_dentry->d_inode->i_nlink == 0) {
+                       kdcore("%08lx: %08lx: no (share)", vma->vm_start, vma->vm_flags);
+                       return 1;
+               }
+
+               kdcore("%08lx: %08lx: no (share)", vma->vm_start, vma->vm_flags);
+               return 0;
+       }
+
+#ifdef CONFIG_MMU
+       /* If it hasn't been written to, don't write it out */
+       if (!vma->anon_vma) {
+               kdcore("%08lx: %08lx: no (!anon)", vma->vm_start, vma->vm_flags);
+               return 0;
+       }
+#endif
+
+       kdcore("%08lx: %08lx: yes", vma->vm_start, vma->vm_flags);
+       return 1;
+}
+
+/* An ELF note in memory */
+struct memelfnote
+{
+       const char *name;
+       int type;
+       unsigned int datasz;
+       void *data;
+};
+
+static int notesize(struct memelfnote *en)
+{
+       int sz;
+
+       sz = sizeof(struct elf_note);
+       sz += roundup(strlen(en->name) + 1, 4);
+       sz += roundup(en->datasz, 4);
+
+       return sz;
+}
+
+/* #define DEBUG */
+
+#define DUMP_WRITE(addr, nr)   \
+       do { if (!dump_write(file, (addr), (nr))) return 0; } while(0)
+#define DUMP_SEEK(off) \
+       do { if (!dump_seek(file, (off))) return 0; } while(0)
+
+static int writenote(struct memelfnote *men, struct file *file)
+{
+       struct elf_note en;
+
+       en.n_namesz = strlen(men->name) + 1;
+       en.n_descsz = men->datasz;
+       en.n_type = men->type;
+
+       DUMP_WRITE(&en, sizeof(en));
+       DUMP_WRITE(men->name, en.n_namesz);
+       /* XXX - cast from long long to long to avoid need for libgcc.a */
+       DUMP_SEEK(roundup((unsigned long)file->f_pos, 4));      /* XXX */
+       DUMP_WRITE(men->data, men->datasz);
+       DUMP_SEEK(roundup((unsigned long)file->f_pos, 4));      /* XXX */
+
+       return 1;
+}
+#undef DUMP_WRITE
+#undef DUMP_SEEK
+
+#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)
+{
+       memcpy(elf->e_ident, ELFMAG, SELFMAG);
+       elf->e_ident[EI_CLASS] = ELF_CLASS;
+       elf->e_ident[EI_DATA] = ELF_DATA;
+       elf->e_ident[EI_VERSION] = EV_CURRENT;
+       elf->e_ident[EI_OSABI] = ELF_OSABI;
+       memset(elf->e_ident+EI_PAD, 0, EI_NIDENT-EI_PAD);
+
+       elf->e_type = ET_CORE;
+       elf->e_machine = ELF_ARCH;
+       elf->e_version = EV_CURRENT;
+       elf->e_entry = 0;
+       elf->e_phoff = sizeof(struct elfhdr);
+       elf->e_shoff = 0;
+       elf->e_flags = ELF_FDPIC_CORE_EFLAGS;
+       elf->e_ehsize = sizeof(struct elfhdr);
+       elf->e_phentsize = sizeof(struct elf_phdr);
+       elf->e_phnum = segs;
+       elf->e_shentsize = 0;
+       elf->e_shnum = 0;
+       elf->e_shstrndx = 0;
+       return;
+}
+
+static inline void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
+{
+       phdr->p_type = PT_NOTE;
+       phdr->p_offset = offset;
+       phdr->p_vaddr = 0;
+       phdr->p_paddr = 0;
+       phdr->p_filesz = sz;
+       phdr->p_memsz = 0;
+       phdr->p_flags = 0;
+       phdr->p_align = 0;
+       return;
+}
+
+static inline void fill_note(struct memelfnote *note, const char *name, int type,
+               unsigned int sz, void *data)
+{
+       note->name = name;
+       note->type = type;
+       note->datasz = sz;
+       note->data = data;
+       return;
+}
+
+/*
+ * fill up all the fields in prstatus from the given task struct, except
+ * registers which need to be filled up seperately.
+ */
+static void fill_prstatus(struct elf_prstatus *prstatus,
+                         struct task_struct *p, long signr)
+{
+       prstatus->pr_info.si_signo = prstatus->pr_cursig = signr;
+       prstatus->pr_sigpend = p->pending.signal.sig[0];
+       prstatus->pr_sighold = p->blocked.sig[0];
+       prstatus->pr_pid = p->pid;
+       prstatus->pr_ppid = p->parent->pid;
+       prstatus->pr_pgrp = process_group(p);
+       prstatus->pr_sid = p->signal->session;
+       if (thread_group_leader(p)) {
+               /*
+                * This is the record for the group leader.  Add in the
+                * cumulative times of previous dead threads.  This total
+                * won't include the time of each live thread whose state
+                * is included in the core dump.  The final total reported
+                * to our parent process when it calls wait4 will include
+                * those sums as well as the little bit more time it takes
+                * this and each other thread to finish dying after the
+                * core dump synchronization phase.
+                */
+               cputime_to_timeval(cputime_add(p->utime, p->signal->utime),
+                                  &prstatus->pr_utime);
+               cputime_to_timeval(cputime_add(p->stime, p->signal->stime),
+                                  &prstatus->pr_stime);
+       } else {
+               cputime_to_timeval(p->utime, &prstatus->pr_utime);
+               cputime_to_timeval(p->stime, &prstatus->pr_stime);
+       }
+       cputime_to_timeval(p->signal->cutime, &prstatus->pr_cutime);
+       cputime_to_timeval(p->signal->cstime, &prstatus->pr_cstime);
+
+       prstatus->pr_exec_fdpic_loadmap = p->mm->context.exec_fdpic_loadmap;
+       prstatus->pr_interp_fdpic_loadmap = p->mm->context.interp_fdpic_loadmap;
+}
+
+static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
+                      struct mm_struct *mm)
+{
+       unsigned int i, len;
+
+       /* first copy the parameters from user space */
+       memset(psinfo, 0, sizeof(struct elf_prpsinfo));
+
+       len = mm->arg_end - mm->arg_start;
+       if (len >= ELF_PRARGSZ)
+               len = ELF_PRARGSZ - 1;
+       if (copy_from_user(&psinfo->pr_psargs,
+                          (const char __user *) mm->arg_start, len))
+               return -EFAULT;
+       for (i = 0; i < len; i++)
+               if (psinfo->pr_psargs[i] == 0)
+                       psinfo->pr_psargs[i] = ' ';
+       psinfo->pr_psargs[len] = 0;
+
+       psinfo->pr_pid = p->pid;
+       psinfo->pr_ppid = p->parent->pid;
+       psinfo->pr_pgrp = process_group(p);
+       psinfo->pr_sid = p->signal->session;
+
+       i = p->state ? ffz(~p->state) + 1 : 0;
+       psinfo->pr_state = i;
+       psinfo->pr_sname = (i > 5) ? '.' : "RSDTZW"[i];
+       psinfo->pr_zomb = psinfo->pr_sname == 'Z';
+       psinfo->pr_nice = task_nice(p);
+       psinfo->pr_flag = p->flags;
+       SET_UID(psinfo->pr_uid, p->uid);
+       SET_GID(psinfo->pr_gid, p->gid);
+       strncpy(psinfo->pr_fname, p->comm, sizeof(psinfo->pr_fname));
+
+       return 0;
+}
+
+/* Here is the structure in which status of each thread is captured. */
+struct elf_thread_status
+{
+       struct list_head list;
+       struct elf_prstatus prstatus;   /* NT_PRSTATUS */
+       elf_fpregset_t fpu;             /* NT_PRFPREG */
+       struct task_struct *thread;
+#ifdef ELF_CORE_COPY_XFPREGS
+       elf_fpxregset_t xfpu;           /* NT_PRXFPREG */
+#endif
+       struct memelfnote notes[3];
+       int num_notes;
+};
+
+/*
+ * In order to add the specific thread information for the elf file format,
+ * we need to keep a linked list of every thread's pr_status and then create
+ * a single section for them in the final core file.
+ */
+static int elf_dump_thread_status(long signr, struct elf_thread_status *t)
+{
+       struct task_struct *p = t->thread;
+       int sz = 0;
+
+       t->num_notes = 0;
+
+       fill_prstatus(&t->prstatus, p, signr);
+       elf_core_copy_task_regs(p, &t->prstatus.pr_reg);
+
+       fill_note(&t->notes[0], "CORE", NT_PRSTATUS, sizeof(t->prstatus),
+                 &t->prstatus);
+       t->num_notes++;
+       sz += notesize(&t->notes[0]);
+
+       t->prstatus.pr_fpvalid = elf_core_copy_task_fpregs(p, NULL, &t->fpu);
+       if (t->prstatus.pr_fpvalid) {
+               fill_note(&t->notes[1], "CORE", NT_PRFPREG, sizeof(t->fpu),
+                         &t->fpu);
+               t->num_notes++;
+               sz += notesize(&t->notes[1]);
+       }
+
+#ifdef ELF_CORE_COPY_XFPREGS
+       if (elf_core_copy_task_xfpregs(p, &t->xfpu)) {
+               fill_note(&t->notes[2], "LINUX", NT_PRXFPREG, sizeof(t->xfpu),
+                         &t->xfpu);
+               t->num_notes++;
+               sz += notesize(&t->notes[2]);
+       }
+#endif
+       return sz;
+}
+
+/*
+ * dump the segments for an MMU process
+ */
+#ifdef CONFIG_MMU
+static int elf_fdpic_dump_segments(struct file *file, struct mm_struct *mm,
+                                  size_t *size, unsigned long *limit)
+{
+       struct vm_area_struct *vma;
+
+       for (vma = current->mm->mmap; vma; vma = vma->vm_next) {
+               unsigned long addr;
+
+               if (!maydump(vma))
+                       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(addr)) {
+                               DUMP_SEEK(file->f_pos + PAGE_SIZE);
+                               page_cache_release(page);
+                       }
+                       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;
+                               }
+                               kunmap(page);
+                               page_cache_release(page);
+                       }
+               }
+       }
+
+       return 0;
+
+end_coredump:
+       return -EFBIG;
+}
+#endif
+
+/*
+ * dump the segments for a NOMMU process
+ */
+#ifndef CONFIG_MMU
+static int elf_fdpic_dump_segments(struct file *file, struct mm_struct *mm,
+                                  size_t *size, unsigned long *limit)
+{
+       struct vm_list_struct *vml;
+
+       for (vml = current->mm->context.vmlist; vml; vml = vml->next) {
+       struct vm_area_struct *vma = vml->vma;
+
+               if (!maydump(vma))
+                       continue;
+
+               if ((*size += PAGE_SIZE) > *limit)
+                       return -EFBIG;
+
+               if (!dump_write(file, (void *) vma->vm_start,
+                               vma->vm_end - vma->vm_start))
+                       return -EIO;
+       }
+
+       return 0;
+}
+#endif
+
+/*
+ * Actual dumper
+ *
+ * This is a two-pass process; first we find the offsets of the bits,
+ * and then they are actually written out.  If we run out of core limit
+ * we just truncate.
+ */
+static int elf_fdpic_core_dump(long signr, struct pt_regs *regs,
+                              struct file *file)
+{
+#define        NUM_NOTES       6
+       int has_dumped = 0;
+       mm_segment_t fs;
+       int segs;
+       size_t size = 0;
+       int i;
+       struct vm_area_struct *vma;
+       struct elfhdr *elf = NULL;
+       loff_t offset = 0, dataoff;
+       unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
+       int numnote;
+       struct memelfnote *notes = NULL;
+       struct elf_prstatus *prstatus = NULL;   /* NT_PRSTATUS */
+       struct elf_prpsinfo *psinfo = NULL;     /* NT_PRPSINFO */
+       struct task_struct *g, *p;
+       LIST_HEAD(thread_list);
+       struct list_head *t;
+       elf_fpregset_t *fpu = NULL;
+#ifdef ELF_CORE_COPY_XFPREGS
+       elf_fpxregset_t *xfpu = NULL;
+#endif
+       int thread_status_size = 0;
+#ifndef CONFIG_MMU
+       struct vm_list_struct *vml;
+#endif
+       elf_addr_t *auxv;
+
+       /*
+        * We no longer stop all VM operations.
+        *
+        * This is because those proceses that could possibly change map_count
+        * or the mmap / vma pages are now blocked in do_exit on current
+        * finishing this core dump.
+        *
+        * Only ptrace can touch these memory addresses, but it doesn't change
+        * the map_count or the pages allocated. So no possibility of crashing
+        * exists while dumping the mm->vm_next areas to the core file.
+        */
+
+       /* alloc memory for large data structures: too large to be on stack */
+       elf = kmalloc(sizeof(*elf), GFP_KERNEL);
+       if (!elf)
+               goto cleanup;
+       prstatus = kzalloc(sizeof(*prstatus), GFP_KERNEL);
+       if (!prstatus)
+               goto cleanup;
+       psinfo = kmalloc(sizeof(*psinfo), GFP_KERNEL);
+       if (!psinfo)
+               goto cleanup;
+       notes = kmalloc(NUM_NOTES * sizeof(struct memelfnote), GFP_KERNEL);
+       if (!notes)
+               goto cleanup;
+       fpu = kmalloc(sizeof(*fpu), GFP_KERNEL);
+       if (!fpu)
+               goto cleanup;
+#ifdef ELF_CORE_COPY_XFPREGS
+       xfpu = kmalloc(sizeof(*xfpu), GFP_KERNEL);
+       if (!xfpu)
+               goto cleanup;
+#endif
+
+       if (signr) {
+               struct elf_thread_status *tmp;
+               read_lock(&tasklist_lock);
+               do_each_thread(g,p)
+                       if (current->mm == p->mm && current != p) {
+                               tmp = kzalloc(sizeof(*tmp), GFP_ATOMIC);
+                               if (!tmp) {
+                                       read_unlock(&tasklist_lock);
+                                       goto cleanup;
+                               }
+                               INIT_LIST_HEAD(&tmp->list);
+                               tmp->thread = p;
+                               list_add(&tmp->list, &thread_list);
+                       }
+               while_each_thread(g,p);
+               read_unlock(&tasklist_lock);
+               list_for_each(t, &thread_list) {
+                       struct elf_thread_status *tmp;
+                       int sz;
+
+                       tmp = list_entry(t, struct elf_thread_status, list);
+                       sz = elf_dump_thread_status(signr, tmp);
+                       thread_status_size += sz;
+               }
+       }
+
+       /* now collect the dump for the current */
+       fill_prstatus(prstatus, current, signr);
+       elf_core_copy_regs(&prstatus->pr_reg, regs);
+
+#ifdef CONFIG_MMU
+       segs = current->mm->map_count;
+#else
+       segs = 0;
+       for (vml = current->mm->context.vmlist; vml; vml = vml->next)
+           segs++;
+#endif
+#ifdef ELF_CORE_EXTRA_PHDRS
+       segs += ELF_CORE_EXTRA_PHDRS;
+#endif
+
+       /* Set up header */
+       fill_elf_fdpic_header(elf, segs + 1);   /* including notes section */
+
+       has_dumped = 1;
+       current->flags |= PF_DUMPCORE;
+
+       /*
+        * Set up the notes in similar form to SVR4 core dumps made
+        * with info from their /proc.
+        */
+
+       fill_note(notes + 0, "CORE", NT_PRSTATUS, sizeof(*prstatus), prstatus);
+       fill_psinfo(psinfo, current->group_leader, current->mm);
+       fill_note(notes + 1, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo);
+
+       numnote = 2;
+
+       auxv = (elf_addr_t *) current->mm->saved_auxv;
+
+       i = 0;
+       do
+               i += 2;
+       while (auxv[i - 2] != AT_NULL);
+       fill_note(&notes[numnote++], "CORE", NT_AUXV,
+                 i * sizeof(elf_addr_t), auxv);
+
+       /* Try to dump the FPU. */
+       if ((prstatus->pr_fpvalid =
+            elf_core_copy_task_fpregs(current, regs, fpu)))
+               fill_note(notes + numnote++,
+                         "CORE", NT_PRFPREG, sizeof(*fpu), fpu);
+#ifdef ELF_CORE_COPY_XFPREGS
+       if (elf_core_copy_task_xfpregs(current, xfpu))
+               fill_note(notes + numnote++,
+                         "LINUX", NT_PRXFPREG, sizeof(*xfpu), xfpu);
+#endif
+
+       fs = get_fs();
+       set_fs(KERNEL_DS);
+
+       DUMP_WRITE(elf, sizeof(*elf));
+       offset += sizeof(*elf);                         /* Elf header */
+       offset += (segs+1) * sizeof(struct elf_phdr);   /* Program headers */
+
+       /* Write notes phdr entry */
+       {
+               struct elf_phdr phdr;
+               int sz = 0;
+
+               for (i = 0; i < numnote; i++)
+                       sz += notesize(notes + i);
+
+               sz += thread_status_size;
+
+               fill_elf_note_phdr(&phdr, sz, offset);
+               offset += sz;
+               DUMP_WRITE(&phdr, sizeof(phdr));
+       }
+
+       /* Page-align dumped data */
+       dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
+
+       /* write program headers for segments dump */
+       for (
+#ifdef CONFIG_MMU
+               vma = current->mm->mmap; vma; vma = vma->vm_next
+#else
+                       vml = current->mm->context.vmlist; vml; vml = vml->next
+#endif
+            ) {
+               struct elf_phdr phdr;
+               size_t sz;
+
+#ifndef CONFIG_MMU
+               vma = vml->vma;
+#endif
+
+               sz = vma->vm_end - vma->vm_start;
+
+               phdr.p_type = PT_LOAD;
+               phdr.p_offset = offset;
+               phdr.p_vaddr = vma->vm_start;
+               phdr.p_paddr = 0;
+               phdr.p_filesz = maydump(vma) ? sz : 0;
+               phdr.p_memsz = sz;
+               offset += phdr.p_filesz;
+               phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
+               if (vma->vm_flags & VM_WRITE)
+                       phdr.p_flags |= PF_W;
+               if (vma->vm_flags & VM_EXEC)
+                       phdr.p_flags |= PF_X;
+               phdr.p_align = ELF_EXEC_PAGESIZE;
+
+               DUMP_WRITE(&phdr, sizeof(phdr));
+       }
+
+#ifdef ELF_CORE_WRITE_EXTRA_PHDRS
+       ELF_CORE_WRITE_EXTRA_PHDRS;
+#endif
+
+       /* write out the notes section */
+       for (i = 0; i < numnote; i++)
+               if (!writenote(notes + i, file))
+                       goto end_coredump;
+
+       /* write out the thread status notes section */
+       list_for_each(t, &thread_list) {
+               struct elf_thread_status *tmp =
+                               list_entry(t, struct elf_thread_status, list);
+
+               for (i = 0; i < tmp->num_notes; i++)
+                       if (!writenote(&tmp->notes[i], file))
+                               goto end_coredump;
+       }
+
+       DUMP_SEEK(dataoff);
+
+       if (elf_fdpic_dump_segments(file, current->mm, &size, &limit) < 0)
+               goto end_coredump;
+
+#ifdef ELF_CORE_WRITE_EXTRA_DATA
+       ELF_CORE_WRITE_EXTRA_DATA;
+#endif
+
+       if (file->f_pos != offset) {
+               /* Sanity check */
+               printk(KERN_WARNING
+                      "elf_core_dump: file->f_pos (%lld) != offset (%lld)\n",
+                      file->f_pos, offset);
+       }
+
+end_coredump:
+       set_fs(fs);
+
+cleanup:
+       while (!list_empty(&thread_list)) {
+               struct list_head *tmp = thread_list.next;
+               list_del(tmp);
+               kfree(list_entry(tmp, struct elf_thread_status, list));
+       }
+
+       kfree(elf);
+       kfree(prstatus);
+       kfree(psinfo);
+       kfree(notes);
+       kfree(fpu);
+#ifdef ELF_CORE_COPY_XFPREGS
+       kfree(xfpu);
+#endif
+       return has_dumped;
+#undef NUM_NOTES
+}
+
+#endif         /* USE_ELF_CORE_DUMP */