introduction of regset ->get() wrappers, switching ELF coredumps to those

[linux-2.6-microblaze.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index e5d50bd..e922a6a 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -208,7 +208,7 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
                size_t len = strlen(k_platform) + 1;
 
                u_platform = (elf_addr_t __user *)STACK_ALLOC(p, len);
-               if (__copy_to_user(u_platform, k_platform, len))
+               if (copy_to_user(u_platform, k_platform, len))
                        return -EFAULT;
        }
 
@@ -221,7 +221,7 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
                size_t len = strlen(k_base_platform) + 1;
 
                u_base_platform = (elf_addr_t __user *)STACK_ALLOC(p, len);
-               if (__copy_to_user(u_base_platform, k_base_platform, len))
+               if (copy_to_user(u_base_platform, k_base_platform, len))
                        return -EFAULT;
        }
 
@@ -231,7 +231,7 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
        get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
        u_rand_bytes = (elf_addr_t __user *)
                       STACK_ALLOC(p, sizeof(k_rand_bytes));
-       if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
+       if (copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
                return -EFAULT;
 
        /* Create the ELF interpreter info */
@@ -314,21 +314,21 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
                return -EFAULT;
 
        /* Now, let's put argc (and argv, envp if appropriate) on the stack */
-       if (__put_user(argc, sp++))
+       if (put_user(argc, sp++))
                return -EFAULT;
 
        /* Populate list of argv pointers back to argv strings. */
        p = mm->arg_end = mm->arg_start;
        while (argc-- > 0) {
                size_t len;
-               if (__put_user((elf_addr_t)p, sp++))
+               if (put_user((elf_addr_t)p, sp++))
                        return -EFAULT;
                len = strnlen_user((void __user *)p, MAX_ARG_STRLEN);
                if (!len || len > MAX_ARG_STRLEN)
                        return -EINVAL;
                p += len;
        }
-       if (__put_user(0, sp++))
+       if (put_user(0, sp++))
                return -EFAULT;
        mm->arg_end = p;
 
@@ -336,14 +336,14 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
        mm->env_end = mm->env_start = p;
        while (envc-- > 0) {
                size_t len;
-               if (__put_user((elf_addr_t)p, sp++))
+               if (put_user((elf_addr_t)p, sp++))
                        return -EFAULT;
                len = strnlen_user((void __user *)p, MAX_ARG_STRLEN);
                if (!len || len > MAX_ARG_STRLEN)
                        return -EINVAL;
                p += len;
        }
-       if (__put_user(0, sp++))
+       if (put_user(0, sp++))
                return -EFAULT;
        mm->env_end = p;
 
@@ -1821,7 +1821,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
                                 long signr, size_t *total)
 {
        unsigned int i;
-       unsigned int regset0_size = regset_size(t->task, &view->regsets[0]);
+       int regset0_size;
 
        /*
         * NT_PRSTATUS is the one special case, because the regset data
@@ -1830,8 +1830,10 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
         * We assume that regset 0 is NT_PRSTATUS.
         */
        fill_prstatus(&t->prstatus, t->task, signr);
-       (void) view->regsets[0].get(t->task, &view->regsets[0], 0, regset0_size,
-                                   &t->prstatus.pr_reg, NULL);
+       regset0_size = regset_get(t->task, &view->regsets[0],
+                  sizeof(t->prstatus.pr_reg), &t->prstatus.pr_reg);
+       if (regset0_size < 0)
+               return 0;
 
        fill_note(&t->notes[0], "CORE", NT_PRSTATUS,
                  PRSTATUS_SIZE(t->prstatus, regset0_size), &t->prstatus);
@@ -1846,32 +1848,28 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
         */
        for (i = 1; i < view->n; ++i) {
                const struct user_regset *regset = &view->regsets[i];
+               int note_type = regset->core_note_type;
+               bool is_fpreg = note_type == NT_PRFPREG;
+               void *data;
+               int ret;
+
                do_thread_regset_writeback(t->task, regset);
-               if (regset->core_note_type && regset->get &&
-                   (!regset->active || regset->active(t->task, regset) > 0)) {
-                       int ret;
-                       size_t size = regset_size(t->task, regset);
-                       void *data = kzalloc(size, GFP_KERNEL);
-                       if (unlikely(!data))
-                               return 0;
-                       ret = regset->get(t->task, regset,
-                                         0, size, data, NULL);
-                       if (unlikely(ret))
-                               kfree(data);
-                       else {
-                               if (regset->core_note_type != NT_PRFPREG)
-                                       fill_note(&t->notes[i], "LINUX",
-                                                 regset->core_note_type,
-                                                 size, data);
-                               else {
-                                       SET_PR_FPVALID(&t->prstatus,
-                                                       1, regset0_size);
-                                       fill_note(&t->notes[i], "CORE",
-                                                 NT_PRFPREG, size, data);
-                               }
-                               *total += notesize(&t->notes[i]);
-                       }
-               }
+               if (!note_type) // not for coredumps
+                       continue;
+               if (regset->active && regset->active(t->task, regset) <= 0)
+                       continue;
+
+               ret = regset_get_alloc(t->task, regset, ~0U, &data);
+               if (ret < 0)
+                       continue;
+
+               if (is_fpreg)
+                       SET_PR_FPVALID(&t->prstatus, 1, regset0_size);
+
+               fill_note(&t->notes[i], is_fpreg ? "CORE" : "LINUX",
+                         note_type, ret, data);
+
+               *total += notesize(&t->notes[i]);
        }
 
        return 1;