From patchwork Sat Oct 31 11:36:04 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: 320056 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp2189705ilc; Sat, 31 Oct 2020 04:44:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxW3xrq/tRMztdpng3OmUQsFyuIUQAeV0CMnWweykDZ2ZxDM7AYvG4c6pBBgP1dvrMETm80 X-Received: by 2002:a17:906:8142:: with SMTP id z2mr6620904ejw.30.1604144685114; Sat, 31 Oct 2020 04:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604144685; cv=none; d=google.com; s=arc-20160816; b=CgHSeTXUVuoKVXJmfnb/Wb1rqSfDrQjW7u/uW+o6JI6f5Pc9NEJTvczLNyRJP05t6c 79v/dE6I/Dm6peuILL2odtpbvNiugjm3bMO5dlSXu0OFIb4+qAASwrmFM62y6AJgdIpk WX1vtK0aO0nYsWtY66r3yXTpeEq0BLk+83HlGgfLY6kDJS+/sRpfnvflGTkewfW3pB8O Dfx0l6BUmLJqdnnbY5kapfMMsCvZiG4De9VDphG7uD4d5zFo5PIWQeX5NO91cUFsBsga kszBczNlfXTnmEkNv2yzoDaMgnVYR8+/S0qzTNzyKPN+Fd8Y9SuOalD9WXZa1ZKDRY29 +h0Q== 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=rWUKVBt7tb9cQlliccX5MKgwxkZVu8gZUc8VJMZ+rtc=; b=x0K7XmUJnApNizVeuDiJoeJyRKQZZLJGGHoQ4JJk6mIIJBVhJ1Gs0fZX1aMrKyd4CY dmG5animtQGspQvazSfMwZFj4hlifm1dEH13V6jKb17wx+7BZ6UubUWlRWDOBySiwXA5 Rm5Nm7D+IAqq1u31HwexU//CT5sZiSEMvYrltlM/U2P8OWscWrzUDRZAduk4AjQ9DaTW QqNOtETXTOrXbZf6/oy3tDvknhBBoUZAJ3So2dvIK1UY1AZa+Ffz2qapIuxNZoTtGpN0 Iam2sIASC1fgYZ0GWkzUYOJqihXJwk/BwubGvOL3uI4L+lWD10Ej2hxBBLP+U4k0ObCB +tUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ns3VG9Fw; 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 d3si624245ejc.49.2020.10.31.04.44.44; Sat, 31 Oct 2020 04:44:45 -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=Ns3VG9Fw; 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 S1727407AbgJaLom (ORCPT + 15 others); Sat, 31 Oct 2020 07:44:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:45070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728191AbgJaLoj (ORCPT ); Sat, 31 Oct 2020 07:44:39 -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 0B9B3205F4; Sat, 31 Oct 2020 11:44:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144678; bh=ow25wOT9xQi0ASWc0Mbvg770YA+wjWXgttwOe8o3log=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ns3VG9FwW1L+R4dWNkBY+SIEgR3+7Hv4xfXlZSC+DFaBmjh1eheQddjIzim5eRhRn z3N+dXxVkQaSmY4kWoRPOVdKJUnOy+E//WYlglgNy/LbPfCViS1v2oZQFnxBRD+9Dr uuddPNROcgoAsSrzGrXYHKEtQvUUEm8r4wkIXz0s= 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.9 22/74] arm64: link with -z norelro regardless of CONFIG_RELOCATABLE Date: Sat, 31 Oct 2020 12:36:04 +0100 Message-Id: <20201031113501.108512551@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113500.031279088@linuxfoundation.org> References: <20201031113500.031279088@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,14 +10,14 @@ # # 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) 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