From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 7 Apr 2022 18:33:22 +0000 (+0200)
Subject: fix up queue-5.10/coredump-elf-pass-coredump_params-into-fill_note_info.patch again
X-Git-Tag: v5.17.2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c21061143eaeb012fc822ad0c250e3d1df635aaa;p=thirdparty%2Fkernel%2Fstable-queue.git

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

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 abb6beef03a..7e10b1a4d4b 100644
--- 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 |   20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ fs/binfmt_elf.c |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
 
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
@@ -59,7 +59,7 @@ 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
+@@ -2047,13 +2047,13 @@ static int fill_note_info(struct elfhdr
  	list_for_each_entry(ets, &info->thread_list, list) {
  		int sz;
  
@@ -70,10 +70,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	/* now collect the dump for the current */
  	memset(info->prstatus, 0, sizeof(*info->prstatus));
 -	fill_prstatus(info->prstatus, current, siginfo->si_signo);
+-	elf_core_copy_regs(&info->prstatus->pr_reg, regs);
 +	fill_prstatus(info->prstatus, current, cprm->siginfo->si_signo);
- 	elf_core_copy_regs(&info->prstatus->pr_reg, regs);
++	elf_core_copy_regs(&info->prstatus->pr_reg, cprm->regs);
  
  	/* Set up header */
+ 	fill_elf_header(elf, phdrs, ELF_ARCH, ELF_CORE_EFLAGS);
 @@ -2069,7 +2069,7 @@ static int fill_note_info(struct elfhdr
  	fill_note(info->notes + 1, "CORE", NT_PRPSINFO,
  		  sizeof(*info->psinfo), info->psinfo);