diff options
| author |   Gabriel Krisman Bertazi <krisman@collabora.com> | 2020-10-03 23:25:30 -0400 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2020-10-26 13:46:46 +0100 |
| commit | 2656af0d5abfa26d7f1e40f92e9953fe155b950a (patch) | |
| tree | 7289000583072d1f45ddd91274072af08a6b5443 | |
| parent | x86/oprofile: Avoid TIF_IA32 when checking 64bit mode (diff) | |
| download | linux-dev-2656af0d5abfa26d7f1e40f92e9953fe155b950a.tar.xz linux-dev-2656af0d5abfa26d7f1e40f92e9953fe155b950a.zip | |
x86/elf: Use e_machine to choose DLINFO in compat
Since TIF_X32 is going away, avoid using it to find the ELF type on
ARCH_DLINFO.
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 loading ARCH_DLINFO in
compat mode.
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20201004032536.1229030-5-krisman@collabora.com
| -rw-r--r-- | arch/x86/include/asm/elf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h index b9a5d488f1a5..9220efc65d78 100644 --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h @@ -361,7 +361,7 @@ do { \ #define AT_SYSINFO 32 #define COMPAT_ARCH_DLINFO \ -if (test_thread_flag(TIF_X32)) \ +if (exec->e_machine == EM_X86_64) \ ARCH_DLINFO_X32; \ else \ ARCH_DLINFO_IA32 |