crypto: caam - use traditional error check pattern

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

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 9fe3b51..13d0539 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -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;
@@ -2040,9 +2038,6 @@ struct elf_thread_status
        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;           /* ELF_CORE_XFPREG_TYPE */
-#endif
        struct memelfnote notes[3];
        int num_notes;
 };
@@ -2073,15 +2068,6 @@ static int elf_dump_thread_status(long signr, struct elf_thread_status *t)
                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", ELF_CORE_XFPREG_TYPE,
-                         sizeof(t->xfpu), &t->xfpu);
-               t->num_notes++;
-               sz += notesize(&t->notes[2]);
-       }
-#endif 
        return sz;
 }
 
@@ -2092,9 +2078,6 @@ struct elf_note_info {
        struct elf_prpsinfo *psinfo;    /* NT_PRPSINFO */
        struct list_head thread_list;
        elf_fpregset_t *fpu;
-#ifdef ELF_CORE_COPY_XFPREGS
-       elf_fpxregset_t *xfpu;
-#endif
        user_siginfo_t csigdata;
        int thread_status_size;
        int numnote;
@@ -2118,11 +2101,6 @@ static int elf_note_info_init(struct elf_note_info *info)
        info->fpu = kmalloc(sizeof(*info->fpu), GFP_KERNEL);
        if (!info->fpu)
                return 0;
-#ifdef ELF_CORE_COPY_XFPREGS
-       info->xfpu = kmalloc(sizeof(*info->xfpu), GFP_KERNEL);
-       if (!info->xfpu)
-               return 0;
-#endif
        return 1;
 }
 
@@ -2186,13 +2164,6 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
        if (info->prstatus->pr_fpvalid)
                fill_note(info->notes + info->numnote++,
                          "CORE", NT_PRFPREG, sizeof(*info->fpu), info->fpu);
-#ifdef ELF_CORE_COPY_XFPREGS
-       if (elf_core_copy_task_xfpregs(current, info->xfpu))
-               fill_note(info->notes + info->numnote++,
-                         "LINUX", ELF_CORE_XFPREG_TYPE,
-                         sizeof(*info->xfpu), info->xfpu);
-#endif
-
        return 1;
 }
 
@@ -2245,9 +2216,6 @@ static void free_note_info(struct elf_note_info *info)
        kfree(info->psinfo);
        kfree(info->notes);
        kfree(info->fpu);
-#ifdef ELF_CORE_COPY_XFPREGS
-       kfree(info->xfpu);
-#endif
 }
 
 #endif