From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95472C2D0A3 for ; Mon, 26 Oct 2020 12:53:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E1E524641 for ; Mon, 26 Oct 2020 12:53:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="iUcE6o1g"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="kaKbR38Z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1775683AbgJZMwm (ORCPT ); Mon, 26 Oct 2020 08:52:42 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:39830 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1775662AbgJZMwj (ORCPT ); Mon, 26 Oct 2020 08:52:39 -0400 Date: Mon, 26 Oct 2020 12:52:36 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1603716756; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4Rqeto/78InwKJzU7bGqoAEw5BDhCuPHB0mKAB98Bt4=; b=iUcE6o1g20eAircKAMgrK2paVuCTBohGopJ8eDJNP/IpRaZuzhnw9U/+vXK/hyWtmb4TbB YLzLEw0I317qZqLhcIfbtSzDoqXc02NuqJ91jLVq8a7j8w3MUHoAppwhMmBJ7bn6TTOmdD YARPiGtr7knr8b+aWwdvNJhtiVhgn51f/GeFnee57vqzrhE/Y0sMuGb13XCoAKmhYCKerZ IaD7yXqFNlDRQHFTATa+OM+T5R/lT/VCvzsvD8OECgfKJQ2GxHTP0zO4oRD0iOd08F6ngI BmE6C7S+1YBrGV2wyc5vrsrWPShFODufMu85FWSTzR1dbdQ2mwCRzPMf6jTbyg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1603716756; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4Rqeto/78InwKJzU7bGqoAEw5BDhCuPHB0mKAB98Bt4=; b=kaKbR38ZDekV66+6ZAGnSL/g5A6pfTHRzQkRYI8nwP/+aQo4CNBfRNR5xkkQ/c1/GatZjQ JJ20a6p1PiTf9BDA== From: "tip-bot2 for Gabriel Krisman Bertazi" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/elf: Use e_machine to choose DLINFO in compat Cc: Gabriel Krisman Bertazi , Thomas Gleixner , Andy Lutomirski , x86 , LKML In-Reply-To: <20201004032536.1229030-5-krisman@collabora.com> References: <20201004032536.1229030-5-krisman@collabora.com> MIME-Version: 1.0 Message-ID: <160371675602.397.8513905247826263985.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 2656af0d5abfa26d7f1e40f92e9953fe155b950a Gitweb: https://git.kernel.org/tip/2656af0d5abfa26d7f1e40f92e9953fe155b950a Author: Gabriel Krisman Bertazi AuthorDate: Sat, 03 Oct 2020 23:25:30 -04:00 Committer: Thomas Gleixner CommitterDate: Mon, 26 Oct 2020 13:46:46 +01:00 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 Signed-off-by: Thomas Gleixner Reviewed-by: Andy Lutomirski Link: https://lore.kernel.org/r/20201004032536.1229030-5-krisman@collabora.com --- arch/x86/include/asm/elf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h index b9a5d48..9220efc 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