Commit 62c3b5a2 authored by Ben Hutchings's avatar Ben Hutchings Committed by Luis Henriques

x86: Reject x32 executables if x32 ABI not supported

commit 0e6d3112 upstream.

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.ukSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent bd5a63d5
...@@ -160,8 +160,9 @@ do { \ ...@@ -160,8 +160,9 @@ do { \
#define elf_check_arch(x) \ #define elf_check_arch(x) \
((x)->e_machine == EM_X86_64) ((x)->e_machine == EM_X86_64)
#define compat_elf_check_arch(x) \ #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 #if __USER32_DS != __USER_DS
# error "The following code assumes __USER32_DS == __USER_DS" # error "The following code assumes __USER32_DS == __USER_DS"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment