From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Mar 2022 02:16:02 +0000 (-0700)
Subject: Merge tag 'execve-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7a801f3956f0c1409d0ece07feb9a2ff78cd15b;p=linux.git

Merge tag 'execve-v5.18-rc1' of git://git./linux/kernel/git/kees/linux

Pull execve updates from Kees Cook:
 "Execve and binfmt updates.

  Eric and I have stepped up to be the active maintainers of this area,
  so here's our first collection. The bulk of the work was in coredump
  handling fixes; additional details are noted below:

   - Handle unusual AT_PHDR offsets (Akira Kawata)

   - Fix initial mapping size when PT_LOADs are not ordered (Alexey
     Dobriyan)

   - Move more code under CONFIG_COREDUMP (Alexey Dobriyan)

   - Fix missing mmap_lock in file_files_note (Eric W. Biederman)

   - Remove a.out support for alpha and m68k (Eric W. Biederman)

   - Include first pages of non-exec ELF libraries in coredump (Jann
     Horn)

   - Don't write past end of notes for regset gap in coredump (Rick
     Edgecombe)

   - Comment clean-ups (Tom Rix)

   - Force single empty string when argv is empty (Kees Cook)

   - Add NULL argv selftest (Kees Cook)

   - Properly redefine PT_GNU_* in terms of PT_LOOS (Kees Cook)

   - MAINTAINERS: Update execve entry with tree (Kees Cook)

   - Introduce initial KUnit testing for binfmt_elf (Kees Cook)"

* tag 'execve-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  binfmt_elf: Don't write past end of notes for regset gap
  a.out: Stop building a.out/osf1 support on alpha and m68k
  coredump: Don't compile flat_core_dump when coredumps are disabled
  coredump: Use the vma snapshot in fill_files_note
  coredump/elf: Pass coredump_params into fill_note_info
  coredump: Remove the WARN_ON in dump_vma_snapshot
  coredump: Snapshot the vmas in do_coredump
  coredump: Move definition of struct coredump_params into coredump.h
  binfmt_elf: Introduce KUnit test
  ELF: Properly redefine PT_GNU_* in terms of PT_LOOS
  MAINTAINERS: Update execve entry with more details
  exec: cleanup comments
  fs/binfmt_elf: Refactor load_elf_binary function
  fs/binfmt_elf: Fix AT_PHDR for unusual ELF files
  binfmt: move more stuff undef CONFIG_COREDUMP
  selftests/exec: Test for empty string on NULL argv
  exec: Force single empty string when argv is empty
  coredump: Also dump first pages of non-executable ELF libraries
  ELF: fix overflow in total mapping size calculation
---

b7a801f3956f0c1409d0ece07feb9a2ff78cd15b
diff --cc include/uapi/linux/elf.h
index fe8e5b74cb39e,6438d55529bf8..787c657bfae8c
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@@ -35,14 -35,12 +35,15 @@@ typedef __s64	Elf64_Sxword
  #define PT_HIOS    0x6fffffff      /* OS-specific */
  #define PT_LOPROC  0x70000000
  #define PT_HIPROC  0x7fffffff
- #define PT_GNU_EH_FRAME		0x6474e550
- #define PT_GNU_PROPERTY		0x6474e553
- 
+ #define PT_GNU_EH_FRAME	(PT_LOOS + 0x474e550)
  #define PT_GNU_STACK	(PT_LOOS + 0x474e551)
+ #define PT_GNU_RELRO	(PT_LOOS + 0x474e552)
+ #define PT_GNU_PROPERTY	(PT_LOOS + 0x474e553)
+ 
  
 +/* ARM MTE memory tag segment type */
 +#define PT_ARM_MEMTAG_MTE	(PT_LOPROC + 0x1)
 +
  /*
   * Extended Numbering
   *