diff mbox series

[4.20,1/1] ARM: fix the cockup in the previous patch

Message ID 20190125224037.4787-2-dave.long@linaro.org
State Superseded
Headers show
Series Fix regression from arm spectre patch series | expand

Commit Message

David Long Jan. 25, 2019, 10:40 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

Comments

Sasha Levin Jan. 26, 2019, 5:57 p.m. UTC | #1 
On Fri, Jan 25, 2019 at 05:40:37PM -0500, David Long wrote:
>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>


Queued for 4.20, thank you.

--
Thanks,
Sasha
diff mbox series

Patch

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