Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e6d3112 authored by Ben Hutchings's avatar Ben Hutchings Committed by Thomas Gleixner
Browse files

x86: Reject x32 executables if x32 ABI not supported 



It is currently possible to execve() an x32 executable on an x86_64
kernel that has only ia32 compat enabled.  However all its syscalls
will fail, even _exit().  This usually causes it to segfault.

Change the ELF compat architecture check so that x32 executables are
rejected if we don't support the x32 ABI.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Link: http://lkml.kernel.org/r/1410120305.6822.9.camel@decadent.org.uk


Cc: stable@vger.kernel.org
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8c7aa698

arch/x86/include/asm/elf.h

+3 −2
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ do { \ 
	((x)->e_machine == EM_X86_64)



#define compat_elf_check_arch(x)					\

	(elf_check_arch_ia32(x) || (x)->e_machine == EM_X86_64)

	(elf_check_arch_ia32(x) ||					\

	 (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))



#if __USER32_DS != __USER_DS

# error "The following code assumes __USER32_DS == __USER_DS"