Commit 9a29a671 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Thomas Gleixner
Browse files

elf: Expose ELF header on arch_setup_additional_pages() 



Like it is done for SET_PERSONALITY with ARM, which requires the ELF
header to select correct personality parameters, x86 requires the
headers when selecting which VDSO to load, instead of relying on the
going-away TIF_IA32/X32 flags.

Add an indirection macro to arch_setup_additional_pages(), that x86 can
reimplement to receive the extra parameter just for ELF files.  This
requires no changes to other architectures, who can continue to use the
original arch_setup_additional_pages for ELF and non-ELF binaries.

Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201004032536.1229030-8-krisman@collabora.com
parent 2424b146

fs/binfmt_elf.c

+1 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ static int load_elf_binary(struct linux_binprm *bprm) 
	set_binfmt(&elf_format);



#ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES

	retval = arch_setup_additional_pages(bprm, !!interpreter);

	retval = ARCH_SETUP_ADDITIONAL_PAGES(bprm, elf_ex, !!interpreter);

	if (retval < 0)

		goto out;

#endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */

fs/compat_binfmt_elf.c

+8 −3
Original line number Diff line number Diff line
@@ -116,10 +116,15 @@ 
#endif



#ifdef compat_arch_setup_additional_pages

#define COMPAT_ARCH_SETUP_ADDITIONAL_PAGES(bprm, ex, interpreter) \

	compat_arch_setup_additional_pages(bprm, interpreter)

#endif



#ifdef	COMPAT_ARCH_SETUP_ADDITIONAL_PAGES

#undef	ARCH_HAS_SETUP_ADDITIONAL_PAGES

#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1

#undef	arch_setup_additional_pages

#define	arch_setup_additional_pages compat_arch_setup_additional_pages

#undef	ARCH_SETUP_ADDITIONAL_PAGES

#define	ARCH_SETUP_ADDITIONAL_PAGES COMPAT_ARCH_SETUP_ADDITIONAL_PAGES

#endif



#ifdef	compat_elf_read_implies_exec

include/linux/elf.h

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
	start_thread(regs, elf_entry, start_stack)

#endif



#if defined(ARCH_HAS_SETUP_ADDITIONAL_PAGES) && !defined(ARCH_SETUP_ADDITIONAL_PAGES)

#define ARCH_SETUP_ADDITIONAL_PAGES(bprm, ex, interpreter) \

	arch_setup_additional_pages(bprm, interpreter)

#endif



#define ELF32_GNU_PROPERTY_ALIGN	4

#define ELF64_GNU_PROPERTY_ALIGN	8