Commit 3316ec8c authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Thomas Gleixner
Browse files

x86/elf: Use e_machine to check for x32/ia32 in setup_additional_pages() 



Since TIF_X32 is going away, avoid using it to find the ELF type when
choosing which additional pages to set up.

According to SysV AMD64 ABI Draft, an AMD64 ELF object using ILP32 must
have ELFCLASS32 with (E_MACHINE == EM_X86_64), so use that ELF field to
differentiate a x32 object from a IA32 object when executing
setup_additional_pages() in compat mode.

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-9-krisman@collabora.com
parent 9a29a671

arch/x86/entry/vdso/vma.c

+2 −2
Original line number Diff line number Diff line
@@ -413,10 +413,10 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) 


#ifdef CONFIG_COMPAT

int compat_arch_setup_additional_pages(struct linux_binprm *bprm,

				       int uses_interp)

				       int uses_interp, bool x32)

{

#ifdef CONFIG_X86_X32_ABI

	if (test_thread_flag(TIF_X32)) {

	if (x32) {

		if (!vdso64_enabled)

			return 0;

		return map_vdso_randomized(&vdso_image_x32);

arch/x86/include/asm/elf.h

+4 −2
Original line number Diff line number Diff line
@@ -383,8 +383,10 @@ struct linux_binprm; 
extern int arch_setup_additional_pages(struct linux_binprm *bprm,

				       int uses_interp);

extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,

					      int uses_interp);

#define compat_arch_setup_additional_pages compat_arch_setup_additional_pages

					      int uses_interp, bool x32);

#define COMPAT_ARCH_SETUP_ADDITIONAL_PAGES(bprm, ex, interpreter)	\

	compat_arch_setup_additional_pages(bprm, interpreter,		\

					   (ex->e_machine == EM_X86_64))



/* Do not change the values. See get_align_mask() */

enum align_flags {