[4.14,17/17] ARM: fix the cockup in the previous patch

Message ID	20190110175150.5239-18-dave.long@linaro.org
State	Superseded
Headers	show Delivered-To: patches@linaro.org Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; From: David Long <dave.long@linaro.org> To: stable@vger.kernel.org, Russell King - ARM Linux <linux@armlinux.org.uk>, Florian Fainelli <f.fainelli@gmail.com>, Julien Thierry <julien.thierry@arm.com>, Tony Lindgren <tony@atomide.com>, Marc Zyngier <marc.zyngier@arm.com>, Mark Rutland <mark.rutland@arm.com> Cc: Greg KH <gregkh@linuxfoundation.org>, Mark Brown <broonie@kernel.org> Subject: [PATCH 4.14 17/17] ARM: fix the cockup in the previous patch Date: Thu, 10 Jan 2019 12:51:50 -0500 Message-Id: <20190110175150.5239-18-dave.long@linaro.org> In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org> References: <20190110175150.5239-1-dave.long@linaro.org>
Series	V4.14 backport of more 32-bit arm spectre patches \| expand [4.14,00/17] V4.14 backport of more 32-bit arm spectre patches [4.14,01/17] ARM: 8789/1: signal: copy registers using __copy_to_user() [4.14,02/17] ARM: 8790/1: signal: always use __copy_to_user to save iwmmxt context [4.14,03/17] ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state [4.14,04/17] ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user() [4.14,05/17] ARM: 8793/1: signal: replace __put_user_error with __put_user [4.14,06/17] ARM: 8794/1: uaccess: Prevent speculative use of the current addr_limit [4.14,07/17] ARM: 8795/1: spectre-v1.1: use put_user() for __put_user() [4.14,08/17] ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitization [4.14,09/17] ARM: 8797/1: spectre-v1.1: harden __copy_to_user [4.14,10/17] ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc [4.14,11/17] ARM: make lookup_processor_type() non-__init [4.14,12/17] ARM: split out processor lookup [4.14,13/17] ARM: clean up per-processor check_bugs method call [4.14,14/17] ARM: add PROC_VTABLE and PROC_TABLE macros [4.14,15/17] ARM: spectre-v2: per-CPU vtables to work around big.Little systems [4.14,16/17] ARM: ensure that processor vtables is not lost after boot [4.14,17/17] ARM: fix the cockup in the previous patch

Message ID

20190110175150.5239-18-dave.long@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of dave.long@linaro.org designates
	209.85.220.65 as permitted sender) client-ip=209.85.220.65; 
From: David Long <dave.long@linaro.org>
To: stable@vger.kernel.org, Russell King - ARM Linux <linux@armlinux.org.uk>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Julien Thierry <julien.thierry@arm.com>,
	Tony Lindgren <tony@atomide.com>, Marc Zyngier <marc.zyngier@arm.com>,
	Mark Rutland <mark.rutland@arm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>,
	Mark Brown <broonie@kernel.org>
Subject: [PATCH 4.14 17/17] ARM: fix the cockup in the previous patch
Date: Thu, 10 Jan 2019 12:51:50 -0500
Message-Id: <20190110175150.5239-18-dave.long@linaro.org>
In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org>
References: <20190110175150.5239-1-dave.long@linaro.org>

Series

V4.14 backport of more 32-bit arm spectre patches | expand

Commit Message

David Long Jan. 10, 2019, 5:51 p.m. UTC

From: Russell King <rmk+kernel@armlinux.org.uk>


Commit d6951f582cc50ba0ad22ef46b599740966599b14 upstream.

The intention in the previous patch was to only place the processor
tables in the .rodata section if big.Little was being built and we
wanted the branch target hardening, but instead (due to the way it
was tested) it ended up always placing the tables into the .rodata
section.

Although harmless, let's correct this anyway.

Fixes: 3a4d0c2172bc ("ARM: ensure that processor vtables is not lost after boot")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

Signed-off-by: David A. Long <dave.long@linaro.org>

---
 arch/arm/mm/proc-macros.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.17.1

diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 19516fbc2c55..5461d589a1e2 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -278,7 +278,7 @@ 
  * If we are building for big.Little with branch predictor hardening,
  * we need the processor function tables to remain available after boot.
  */
-#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
+#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
 	.section ".rodata"
 #endif
 	.type	\name\()_processor_functions, #object
@@ -316,7 +316,7 @@  ENTRY(\name\()_processor_functions)
 	.endif
 
 	.size	\name\()_processor_functions, . - \name\()_processor_functions
-#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
+#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
 	.previous
 #endif
 .endm

[4.14,17/17] ARM: fix the cockup in the previous patch

Commit Message

Patch