From patchwork Thu Dec 17 00:40:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 11978825 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 F1A13C4361B for ; Thu, 17 Dec 2020 00:42:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9DF0523741 for ; Thu, 17 Dec 2020 00:42:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DF0523741 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pV2rWZJkv9SM+PkTkj8RrX84S6eKFHHINlEE+X3xN6E=; b=J+slD4n2iGzzt+z8A0/f8xtlE f9OZiPYM2fvxDEVpaNCbv2LVJdx+7r3Vi5MTQCP+9LouucVkt5a1VyCCyg7M2ngmDab2W1yNvXOyY Gqj+wHiu78xhm9GG4f/Gc3Qk3XpSSLBRHIbiX7SKt77i/KOqz3JjWrjgLd2gSn9G5OfKmzCbcBK2C VzQpMdunBkiyELmEjqG101MoDahEZJe1a+04hGC9D7adGg5+3e3IBkj9Z1mQbtelNhcV1PdlkAkYm pWWaRpL8+EbEn16+OxfwJH2VqbHFHs21ElmsXXxrGVEtH9vMrOeKKlure44QrPd564M+9XB9IPLHs FtDW0lrqw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kphM0-00021x-4I; Thu, 17 Dec 2020 00:41:12 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kphLx-00021Y-Dv for linux-arm-kernel@lists.infradead.org; Thu, 17 Dec 2020 00:41:10 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id e68so23456469yba.7 for ; Wed, 16 Dec 2020 16:41:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc:content-transfer-encoding; bh=nQgcH8JHZsnhKqD6NfgVnumKz059kSgcZknDGcmmB+s=; b=EPE7cvqG1CwG1U3Og2cZeOASwzVU7A+l3tQlQ2Q1Qj+umQaGHp3C5Fzz5bGK0Crd04 /n0YTZKkbnJr55TZON2xRNoUuFq97eIpqlag40vlkNDS9th2edu7BRoJnTUF+LPOl8rU 5QaH44QM+D7Kwn3CKIxtIUPM9XYOv/kqIUwu885gR114fRktV2zSCPew4FsWlE4Rnrqj Sef/7Zkk91vRjq1xBxnjAM/t8D+kC9wSde//oqYHh2BBIY2f/0vJh1lY1ypqnmuM7/Hi +/2Bf97sUoUrVjttz+wvnStPfEKtpMxMUPz5lBve+Tqg6wmZ2Ta5IY6wJaVGLQbdGFHN YyZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=nQgcH8JHZsnhKqD6NfgVnumKz059kSgcZknDGcmmB+s=; b=goq31P09k57eZe/n33Gk+1JEV9LSbrXiSJaBK9dQDWqh6FEWbLZR0KqJD7W4pKSUWw 0E0Z9kh0uZKNTRCA3YKrBXGVTdNS73le2u/vwq46IW5NsuwFKLKwbbduoSeq0H37yzjy jkfQ00jGTG+AeTxLdT8efvTRyuyuceoSJ4NYaucoJqx2hZWwn04LzRWy0Ao2QfDdKRS6 6P5szL54MUua/Lexx9ExOfkkvmJE4IWPcWTjkroC8i/m5Ka6NSYzD3QYJKaXPTL/U1jW E6xjk5s0IWnlJOSjWK2oBH+5qL7KqggyJYMuI/1FnzFF5GmAdC/B4YeTTfDnctsqmRTM dSBw== X-Gm-Message-State: AOAM530k9RDKtX6ZeO2IynB4bWd4gODnDx0r8ff6mzpbU+nHpVjFFBav ILmLuvii5LFZuFrjV1PKFNdrBjLvljTQbrzBMyw= X-Google-Smtp-Source: ABdhPJzDCsUbB7yanWIFRkse1AcPCUp2lzaL4KZ94TktWtsEANgAnit5Tri5D+L2KDcRYZoHWgMFew1sqgzoawDx0kU= X-Received: from ndesaulniers1.mtv.corp.google.com ([2620:15c:211:202:f693:9fff:fef4:4d25]) (user=ndesaulniers job=sendgmr) by 2002:a25:ed7:: with SMTP id 206mr50304845ybo.136.1608165666117; Wed, 16 Dec 2020 16:41:06 -0800 (PST) Date: Wed, 16 Dec 2020 16:40:51 -0800 In-Reply-To: Message-Id: <20201217004051.1247544-1-ndesaulniers@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH] arm64: link with -z norelro for LLD or aarch64-elf From: Nick Desaulniers To: Catalin Marinas , Will Deacon X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201216_194109_529487_415D2E59 X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "kernelci . org bot" , =?utf-8?b?RsSBbmctcnXDrCBTw7Ju?= =?utf-8?b?Zw==?= , Quentin Perret , Alan Modra , Nick Desaulniers , Peter Smith , stable , linux-kernel@vger.kernel.org, clang-built-linux , kernel-team , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org With newer GNU binutils, linking with BFD produces warnings for vmlinux: aarch64-linux-gnu-ld: warning: -z norelro ignored BFD can produce this warning when the target emulation mode does not support RELRO relocation types, and -z relro or -z norelro is passed. Alan Modra clarifies: The default linker emulation for an aarch64-linux ld.bfd is -maarch64linux, the default for an aarch64-elf linker is -maarch64elf. They are not equivalent. If you choose -maarch64elf you get an emulation that doesn't support -z relro. The ARCH=arm64 kernel prefers -maarch64elf, but may fall back to -maarch64linux based on the toolchain configuration. LLD will always create RELRO relocation types regardless of target emulation. To avoid the above warning when linking with BFD, pass -z norelro only when linking with LLD or with -maarch64linux. Cc: Alan Modra Cc: Ard Biesheuvel Cc: Fāng-ruì Sòng Fixes: 3b92fa7485eb ("arm64: link with -z norelro regardless of CONFIG_RELOCATABLE") Reported-by: kernelci.org bot Reported-by: Quentin Perret Signed-off-by: Nick Desaulniers Acked-by: Ard Biesheuvel --- arch/arm64/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 6be9b3750250..90309208bb28 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -10,7 +10,7 @@ # # Copyright (C) 1995-2001 by Russell King -LDFLAGS_vmlinux :=--no-undefined -X -z norelro +LDFLAGS_vmlinux :=--no-undefined -X ifeq ($(CONFIG_RELOCATABLE), y) # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour @@ -115,16 +115,20 @@ KBUILD_CPPFLAGS += -mbig-endian CHECKFLAGS += -D__AARCH64EB__ # Prefer the baremetal ELF build target, but not all toolchains include # it so fall back to the standard linux version if needed. -KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb) +KBUILD_LDFLAGS += -EB $(call ld-option, -maarch64elfb, -maarch64linuxb -z norelro) UTS_MACHINE := aarch64_be else KBUILD_CPPFLAGS += -mlittle-endian CHECKFLAGS += -D__AARCH64EL__ # Same as above, prefer ELF but fall back to linux target if needed. -KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux) +KBUILD_LDFLAGS += -EL $(call ld-option, -maarch64elf, -maarch64linux -z norelro) UTS_MACHINE := aarch64 endif +ifeq ($(CONFIG_LD_IS_LLD), y) +KBUILD_LDFLAGS += -z norelro +endif + CHECKFLAGS += -D__aarch64__ ifeq ($(CONFIG_DYNAMIC_FTRACE_WITH_REGS),y)