From: Greg Kroah-Hartman Date: Wed, 6 Apr 2022 12:10:17 +0000 (+0200) Subject: fix up queue-5.10/coredump-elf-pass-coredump_params-into-fill_note_info.patch X-Git-Tag: v5.17.2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4898cff510a4cc8c7934917186d77adab87bae24;p=thirdparty%2Fkernel%2Fstable-queue.git 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 bdc20138f6d..abb6beef03a 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 Signed-off-by: "Eric W. Biederman" Signed-off-by: Greg Kroah-Hartman --- - 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 { 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);