fix up queue-5.10/coredump-elf-pass-coredump_params-into-fill_note_info.patch

diff --git a/queue-5.10/coredump-elf-pass-coredump_params-into-fill_note_info.patch b/queue-5.10/coredump-elf-pass-coredump_params-into-fill_note_info.patch
index bdc20138f6df857f46b828f892879f04381ad1af..abb6beef03afdd407da0b57fc1987be9233d4b40 100644 (file)
--- a/queue-5.10/coredump-elf-pass-coredump_params-into-fill_note_info.patch
+++ b/queue-5.10/coredump-elf-pass-coredump_params-into-fill_note_info.patch
@@ -18,8 +18,8 @@ Reviewed-by: Kees Cook <keescook@chromium.org>
 Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- fs/binfmt_elf.c |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ fs/binfmt_elf.c |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
 
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
@@ -59,6 +59,21 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
        struct core_thread *ct;
        struct elf_thread_status *ets;
+@@ -2047,12 +2047,12 @@ static int fill_note_info(struct elfhdr
+       list_for_each_entry(ets, &info->thread_list, list) {
+               int sz;
+ 
+-              sz = elf_dump_thread_status(siginfo->si_signo, ets);
++              sz = elf_dump_thread_status(cprm->siginfo->si_signo, ets);
+               info->thread_status_size += sz;
+       }
+       /* now collect the dump for the current */
+       memset(info->prstatus, 0, sizeof(*info->prstatus));
+-      fill_prstatus(info->prstatus, current, siginfo->si_signo);
++      fill_prstatus(info->prstatus, current, cprm->siginfo->si_signo);
+       elf_core_copy_regs(&info->prstatus->pr_reg, regs);
+ 
+       /* Set up header */
 @@ -2069,7 +2069,7 @@ static int fill_note_info(struct elfhdr
        fill_note(info->notes + 1, "CORE", NT_PRPSINFO,
                  sizeof(*info->psinfo), info->psinfo);