From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Sep 2024 09:53:31 +0000 (+0200)
Subject: Merge tag 'execve-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=667495de218c25e909c6b33ed647b592a8a71a02;p=linux.git

Merge tag 'execve-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull execve updates from Kees Cook:

 - binfmt_elf: Dump smaller VMAs first in ELF cores (Brian Mak)

 - binfmt_elf: mseal address zero (Jeff Xu)

 - binfmt_elf, coredump: Log the reason of the failed core dumps (Roman
   Kisel)

* tag 'execve-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  binfmt_elf: mseal address zero
  binfmt_elf: Dump smaller VMAs first in ELF cores
  binfmt_elf, coredump: Log the reason of the failed core dumps
  coredump: Standartize and fix logging
---

667495de218c25e909c6b33ed647b592a8a71a02
diff --cc fs/binfmt_elf.c
index 01bcbe7fdebd,c3aa700aeb3c..34d0d1e43f36
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@@ -2092,20 -2107,28 +2107,28 @@@ static int elf_core_dump(struct coredum
  			phdr.p_flags |= PF_X;
  		phdr.p_align = ELF_EXEC_PAGESIZE;
  
- 		if (!dump_emit(cprm, &phdr, sizeof(phdr)))
+ 		if (!dump_emit(cprm, &phdr, sizeof(phdr))) {
+ 			coredump_report_failure("Error emitting program headers");
  			goto end_coredump;
+ 		}
  	}
  
- 	if (!elf_core_write_extra_phdrs(cprm, offset))
+ 	if (!elf_core_write_extra_phdrs(cprm, offset)) {
+ 		coredump_report_failure("Error writing out extra program headers");
  		goto end_coredump;
+ 	}
  
  	/* write out the notes section */
- 	if (!write_note_info(&info, cprm))
+ 	if (!write_note_info(&info, cprm)) {
+ 		coredump_report_failure("Error writing out notes");
  		goto end_coredump;
+ 	}
  
 -	/* For cell spufs */
 +	/* For cell spufs and x86 xstate */
- 	if (elf_coredump_extra_notes_write(cprm))
+ 	if (elf_coredump_extra_notes_write(cprm)) {
+ 		coredump_report_failure("Error writing out extra notes");
  		goto end_coredump;
+ 	}
  
  	/* Align to page */
  	dump_skip_to(cprm, dataoff);