From patchwork Tue Nov 3 20:34:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 320480 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp4924373ilc; Tue, 3 Nov 2020 13:26:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXBVEpbTPt7aZk2gDN36pShcThaFECMM94nNseRB/gAwk3GB9XmOfTCo6UVHZf/MxzxACr X-Received: by 2002:a17:906:3644:: with SMTP id r4mr15859544ejb.517.1604438815674; Tue, 03 Nov 2020 13:26:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604438815; cv=none; d=google.com; s=arc-20160816; b=bpkGwyD/OCSxpVQx4IG3j0ejDdPBbfrNQWzbYYO51fTgGO8VcglUfT/vql815oQ4g7 fMV8QUxznFKraMv2cX1gZYo31jZrgJl5SjctLGh6S6uxOCpD/cRktCowz9Vth0aLG9eS 2Yxv+Y/e7VbSVHxBcIa8fOxkVgZm0Y6sY8+jLHI/0UJh7fnwAhA/c56MyhQsGnsomnm2 6teQCaR7OwHfmjiJQljxuZK/QpfPwVzqtCH8Z7UGKUgdksNLUbT2QPjj7GvLLZMYp4iV KVD7gZDNQ6skFbI06Pvf8dcV7igPrEIMUFZ/FJcO5n2tMhNfuboFt9syAG/nSedwQyzD UKLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jXYoQ8mnWDfwHyIYRtmfO6A6Md+NSi5qzIMIt/pdlAg=; b=UlQP5J4qqzh0iGki8cL3KEggWCm3LCOOi5x0n9ZRipFOj/PXtN5eRBfd9Ms5DlBZr+ pdW4vih1iDZA0dv1fWHKXNuoWAOM6FY23rQfr1zrPcnXPBHiZ+NIXJGlSu5+OuswRSTO KNFAsxtS01x9ubbD5RoPdyn9cbKP2YfjjyL4NBKLOF2VbYA5PYjfUWjlmkUw/XPuVTf1 EMttlM9zlz3ln8GZT9WzEYELoKrLGJtJbRrwn03ZYl0Y8RCHEpmCwz1Q5kgZkGsk7e7W FsLZWtpET0SKOCZt09S6hyj6whEdpSxqvCLZm9735RXLD/HF3TzHxBiBNb0KtV8nSbK+ Aydw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bLveqYnm; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bd20si5809114edb.98.2020.11.03.13.26.55; Tue, 03 Nov 2020 13:26:55 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bLveqYnm; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732452AbgKCV0u (ORCPT + 15 others); Tue, 3 Nov 2020 16:26:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:38056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387463AbgKCVB1 (ORCPT ); Tue, 3 Nov 2020 16:01:27 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 96ACC205ED; Tue, 3 Nov 2020 21:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437287; bh=dAckfZUvuQTzjuGDQr/NoLlGwNVuu2+sA3yLjksJmoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bLveqYnmDWKzG2Ht15jpB42YBac5AY4WtX+BADDIVTSwbhRSWGBDhyjN1B848dWFJ taMdRSLAmEsLPa4XRTP2xeRO9heoprT97dj6LRj+elxWo1LRKRmkM45lWEvELu2pyf Tmm2Mz6G+dhvO4b5N5WLDHv4YokYX7dy38du2rP8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nick Desaulniers , Will Deacon Subject: [PATCH 4.19 004/191] arm64: link with -z norelro regardless of CONFIG_RELOCATABLE Date: Tue, 3 Nov 2020 21:34:56 +0100 Message-Id: <20201103203233.221060805@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers commit 3b92fa7485eba16b05166fddf38ab42f2ff6ab95 upstream. With CONFIG_EXPERT=y, CONFIG_KASAN=y, CONFIG_RANDOMIZE_BASE=n, CONFIG_RELOCATABLE=n, we observe the following failure when trying to link the kernel image with LD=ld.lld: error: section: .exit.data is not contiguous with other relro sections ld.lld defaults to -z relro while ld.bfd defaults to -z norelro. This was previously fixed, but only for CONFIG_RELOCATABLE=y. Fixes: 3bbd3db86470 ("arm64: relocatable: fix inconsistencies in linker script and options") Signed-off-by: Nick Desaulniers Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20201016175339.2429280-1-ndesaulniers@google.com Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -10,7 +10,7 @@ # # Copyright (C) 1995-2001 by Russell King -LDFLAGS_vmlinux :=--no-undefined -X +LDFLAGS_vmlinux :=--no-undefined -X -z norelro CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) GZFLAGS :=-9 @@ -18,7 +18,7 @@ ifeq ($(CONFIG_RELOCATABLE), y) # Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour # for relative relocs, since this leads to better Image compression # with the relocation offsets always being zero. -LDFLAGS_vmlinux += -shared -Bsymbolic -z notext -z norelro \ +LDFLAGS_vmlinux += -shared -Bsymbolic -z notext \ $(call ld-option, --no-apply-dynamic-relocs) endif