From patchwork Sat Oct 31 11:35:03 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: 320054 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp2186337ilc; Sat, 31 Oct 2020 04:38:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrn20fLXNIZG2PLLq6MaHPfeiU6XIlorsaZHHcSwYkOBjMoDU+AEr1pvszSf7vaHyLRKDh X-Received: by 2002:a17:906:512:: with SMTP id j18mr6991186eja.370.1604144321082; Sat, 31 Oct 2020 04:38:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604144321; cv=none; d=google.com; s=arc-20160816; b=GvF1xY3VgFSxEidJmlGL56DOdlOYbvtik7LVMhllgvF7cnQ1CM05jhfh4iLQW4wGCT xDo54g2NfJ3pimOjX03luJVKMIVIAcOQ5BUty8RYnLGYNZcv+KDMU/8XH/7L1VBucN/z UhwinQ3fBST/JEceFpoko53OS+VHwt78KfGgmaeGSwgkgMcv9l4I+FIQ/rmv5V39V4mh QrqbLyN7JWbwQdJij3443NkKuTP4ko4UJ4fnju6sTySxhT2+PwOUB/6aPdv/R5aqRjJJ 0SbrcZ6RdYnXIDQiTomWwBCIVMUqH+DX5sNeQ0tZXAoCpJDJIBt1/2+JNJ83zxjxLBN4 4TfQ== 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=TB1549TDXtr5OpuYgrz26uBQS29LB8WElY0TlEkNiL9DkXabFGcfGhv+djCVQsLN6L ZGX91yi/FVfnCSO9DYEF2vDjFLjO1NWAzLMKXh7biJTQNSy2LVNbrqg2ZHukZn++qaFo RoQPTaWrrzusObM7wZABNnjUNT9v9pAIWo++z0/D9Yk/pgvn3V5ITIHTMDUAIr8bjH4M PoPkqMz/vGEHALwyr+a+nI/8ZyyO3IV2xzp0xagMV7gKLCGc1vI5EDJt0Uis2IRIO5Eq Pge3EqABY2/QKhADvZ0OrCnrccrZ2E2FwhVTlNh8AyHxg1o9zgRq2X2b5/NEO9bECqrr /gIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YTD5e57v; 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 w19si369608edi.177.2020.10.31.04.38.40; Sat, 31 Oct 2020 04:38:41 -0700 (PDT) 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=YTD5e57v; 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 S1727100AbgJaLid (ORCPT + 15 others); Sat, 31 Oct 2020 07:38:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:33952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727128AbgJaLgF (ORCPT ); Sat, 31 Oct 2020 07:36:05 -0400 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 9FC552087D; Sat, 31 Oct 2020 11:36:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144165; bh=dAckfZUvuQTzjuGDQr/NoLlGwNVuu2+sA3yLjksJmoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTD5e57vWul6tz2SgKOTKK2I22Q7f0+rQEDg+HUnUe8ITwavadZVZGR2uaW6bj5+p ZDBkYGjgM3NN6R8/igtZ7R+Xoi90PlqRKpcZWZoJ9nv+KbpwKYJeZtshBLW4/EgEfA yZXjKqS7Q5Nr8WHqiirdiAGglRQgfSRIH3FSuxL0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nick Desaulniers , Will Deacon Subject: [PATCH 5.4 07/49] arm64: link with -z norelro regardless of CONFIG_RELOCATABLE Date: Sat, 31 Oct 2020 12:35:03 +0100 Message-Id: <20201031113455.801329619@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113455.439684970@linuxfoundation.org> References: <20201031113455.439684970@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