Commit 92f74f7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull execve updates from Kees Cook:

 - Provide knob to change (previously fixed) coredump NOTES size
   (Allen Pais)

 - Add sched_prepare_exec tracepoint (Marco Elver)

 - Make /proc/$pid/auxv work under binfmt_elf_fdpic (Max Filippov)

 - Convert ARCH_HAVE_EXTRA_ELF_NOTES to proper Kconfig (Vignesh
   Balasubramanian)

 - Leave a gap between .bss and brk

* tag 'execve-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  fs/coredump: Enable dynamic configuration of max file note size
  binfmt_elf_fdpic: fix /proc/<pid>/auxv
  binfmt_elf: Leave a gap between .bss and brk
  Replace macro "ARCH_HAVE_EXTRA_ELF_NOTES" with kconfig
  tracing: Add sched_prepare_exec tracepoint
parents 1ba58f1a 4bbf9c3b

arch/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -510,6 +510,15 @@ config MMU_LAZY_TLB_SHOOTDOWN 
config ARCH_HAVE_NMI_SAFE_CMPXCHG

	bool



config ARCH_HAVE_EXTRA_ELF_NOTES

	bool

	help

	  An architecture should select this in order to enable adding an

	  arch-specific ELF note section to core files. It must provide two

	  functions: elf_coredump_extra_notes_size() and

	  elf_coredump_extra_notes_write() which are invoked by the ELF core

	  dumper.



config ARCH_HAS_NMI_SAFE_THIS_CPU_OPS

	bool

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ config PPC 
	select ARCH_HAS_UACCESS_FLUSHCACHE

	select ARCH_HAS_UBSAN

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_HAVE_EXTRA_ELF_NOTES        if SPU_BASE

	select ARCH_KEEP_MEMBLOCK

	select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE	if PPC_RADIX_MMU

	select ARCH_MIGHT_HAVE_PC_PARPORT

arch/powerpc/include/asm/elf.h

+0 −2
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, 
/* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */

#define NT_SPU		1



#define ARCH_HAVE_EXTRA_ELF_NOTES



#endif /* CONFIG_SPU_BASE */



#ifdef CONFIG_PPC64

fs/binfmt_elf.c

+8 −2
Original line number Diff line number Diff line
@@ -1262,6 +1262,9 @@ static int load_elf_binary(struct linux_binprm *bprm) 
		if (IS_ENABLED(CONFIG_ARCH_HAS_ELF_RANDOMIZE) &&

		    elf_ex->e_type == ET_DYN && !interpreter) {

			mm->brk = mm->start_brk = ELF_ET_DYN_BASE;

		} else {

			/* Otherwise leave a gap between .bss and brk. */

			mm->brk = mm->start_brk = mm->brk + PAGE_SIZE;

		}



		mm->brk = mm->start_brk = arch_randomize_brk(mm);
@@ -1564,7 +1567,6 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata, 
	fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);

}



#define MAX_FILE_NOTE_SIZE (4*1024*1024)

/*

 * Format of NT_FILE note:

 *
@@ -1592,8 +1594,12 @@ static int fill_files_note(struct memelfnote *note, struct coredump_params *cprm 


	names_ofs = (2 + 3 * count) * sizeof(data[0]);

 alloc:

	if (size >= MAX_FILE_NOTE_SIZE) /* paranoia check */

	/* paranoia check */

	if (size >= core_file_note_size_limit) {

		pr_warn_once("coredump Note size too large: %u (does kernel.core_file_note_size_limit sysctl need adjustment?\n",

			      size);

		return -EINVAL;

	}

	size = round_up(size, PAGE_SIZE);

	/*

	 * "size" can be 0 here legitimately.

fs/binfmt_elf_fdpic.c

+39 −46
Original line number Diff line number Diff line
@@ -505,8 +505,9 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, 
	char *k_platform, *k_base_platform;

	char __user *u_platform, *u_base_platform, *p;

	int loop;

	int nr;	/* reset for each csp adjustment */

	unsigned long flags = 0;

	int ei_index;

	elf_addr_t *elf_info;



#ifdef CONFIG_MMU

	/* In some cases (e.g. Hyper-Threading), we want to avoid L1 evictions
@@ -601,44 +602,24 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, 
	csp -= sp & 15UL;

	sp -= sp & 15UL;



	/* put the ELF interpreter info on the stack */

	/* Create the ELF interpreter info */

	elf_info = (elf_addr_t *)mm->saved_auxv;

	/* update AT_VECTOR_SIZE_BASE if the number of NEW_AUX_ENT() changes */

#define NEW_AUX_ENT(id, val) \

	do { \

		struct { unsigned long _id, _val; } __user *ent, v;	\

									\

		ent = (void __user *) csp;				\

		v._id = (id);						\

		v._val = (val);						\

		if (copy_to_user(ent + nr, &v, sizeof(v)))		\

			return -EFAULT;					\

		nr++;							\

		*elf_info++ = id; \

		*elf_info++ = val; \

	} while (0)



	nr = 0;

	csp -= 2 * sizeof(unsigned long);

	NEW_AUX_ENT(AT_NULL, 0);

	if (k_platform) {

		nr = 0;

		csp -= 2 * sizeof(unsigned long);

		NEW_AUX_ENT(AT_PLATFORM,

			    (elf_addr_t) (unsigned long) u_platform);

	}



	if (k_base_platform) {

		nr = 0;

		csp -= 2 * sizeof(unsigned long);

		NEW_AUX_ENT(AT_BASE_PLATFORM,

			    (elf_addr_t) (unsigned long) u_base_platform);

	}



	if (bprm->have_execfd) {

		nr = 0;

		csp -= 2 * sizeof(unsigned long);

		NEW_AUX_ENT(AT_EXECFD, bprm->execfd);

	}



	nr = 0;

	csp -= DLINFO_ITEMS * 2 * sizeof(unsigned long);

#ifdef ARCH_DLINFO

	/*

	 * ARCH_DLINFO must come first so PPC can do its special alignment of

	 * AUXV.

	 * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT() in

	 * ARCH_DLINFO changes

	 */

	ARCH_DLINFO;

#endif

	NEW_AUX_ENT(AT_HWCAP,	ELF_HWCAP);

#ifdef ELF_HWCAP2

	NEW_AUX_ENT(AT_HWCAP2,	ELF_HWCAP2);
@@ -659,17 +640,29 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, 
	NEW_AUX_ENT(AT_EGID,	(elf_addr_t) from_kgid_munged(cred->user_ns, cred->egid));

	NEW_AUX_ENT(AT_SECURE,	bprm->secureexec);

	NEW_AUX_ENT(AT_EXECFN,	bprm->exec);

	if (k_platform)

		NEW_AUX_ENT(AT_PLATFORM,

			    (elf_addr_t)(unsigned long)u_platform);

	if (k_base_platform)

		NEW_AUX_ENT(AT_BASE_PLATFORM,

			    (elf_addr_t)(unsigned long)u_base_platform);

	if (bprm->have_execfd)

		NEW_AUX_ENT(AT_EXECFD, bprm->execfd);

#undef NEW_AUX_ENT

	/* AT_NULL is zero; clear the rest too */

	memset(elf_info, 0, (char *)mm->saved_auxv +

	       sizeof(mm->saved_auxv) - (char *)elf_info);



#ifdef ARCH_DLINFO

	nr = 0;

	csp -= AT_VECTOR_SIZE_ARCH * 2 * sizeof(unsigned long);

	/* And advance past the AT_NULL entry.  */

	elf_info += 2;



	/* ARCH_DLINFO must come last so platform specific code can enforce

	 * special alignment requirements on the AUXV if necessary (eg. PPC).

	 */

	ARCH_DLINFO;

#endif

#undef NEW_AUX_ENT

	ei_index = elf_info - (elf_addr_t *)mm->saved_auxv;

	csp -= ei_index * sizeof(elf_addr_t);



	/* Put the elf_info on the stack in the right place.  */

	if (copy_to_user((void __user *)csp, mm->saved_auxv,

			 ei_index * sizeof(elf_addr_t)))

		return -EFAULT;



	/* allocate room for argv[] and envv[] */

	csp -= (bprm->envc + 1) * sizeof(elf_caddr_t);