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 [thread overview]
Message-ID: <20190110175150.5239-18-dave.long@linaro.org> (raw)
In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org>
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(-)
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
--
2.17.1
next prev parent reply other threads:[~2019-01-10 17:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 17:51 [PATCH 4.14 00/17] V4.14 backport of more 32-bit arm spectre patches David Long
2019-01-10 17:51 ` [PATCH 4.14 01/17] ARM: 8789/1: signal: copy registers using __copy_to_user() David Long
2019-01-10 17:51 ` [PATCH 4.14 02/17] ARM: 8790/1: signal: always use __copy_to_user to save iwmmxt context David Long
2019-01-10 17:51 ` [PATCH 4.14 03/17] ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state David Long
2019-01-10 17:51 ` [PATCH 4.14 04/17] ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user() David Long
2019-01-10 17:51 ` [PATCH 4.14 05/17] ARM: 8793/1: signal: replace __put_user_error with __put_user David Long
2019-01-10 17:51 ` [PATCH 4.14 06/17] ARM: 8794/1: uaccess: Prevent speculative use of the current addr_limit David Long
2019-01-10 17:51 ` [PATCH 4.14 07/17] ARM: 8795/1: spectre-v1.1: use put_user() for __put_user() David Long
2019-01-10 17:51 ` [PATCH 4.14 08/17] ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitization David Long
2019-01-10 17:51 ` [PATCH 4.14 09/17] ARM: 8797/1: spectre-v1.1: harden __copy_to_user David Long
2019-01-10 17:51 ` [PATCH 4.14 10/17] ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc David Long
2019-01-10 17:51 ` [PATCH 4.14 11/17] ARM: make lookup_processor_type() non-__init David Long
2019-01-10 17:51 ` [PATCH 4.14 12/17] ARM: split out processor lookup David Long
2019-01-10 17:51 ` [PATCH 4.14 13/17] ARM: clean up per-processor check_bugs method call David Long
2019-01-10 17:51 ` [PATCH 4.14 14/17] ARM: add PROC_VTABLE and PROC_TABLE macros David Long
2019-01-10 17:51 ` [PATCH 4.14 15/17] ARM: spectre-v2: per-CPU vtables to work around big.Little systems David Long
2019-01-10 17:51 ` [PATCH 4.14 16/17] ARM: ensure that processor vtables is not lost after boot David Long
2019-01-10 17:51 ` David Long [this message]
2019-01-15 15:45 ` [PATCH 4.14 00/17] V4.14 backport of more 32-bit arm spectre patches Greg KH
2019-01-15 16:07 ` David Long
2019-01-15 16:30 ` Greg KH
2019-01-15 16:39 ` David Long
2019-01-15 17:06 ` Russell King - ARM Linux admin
2019-01-15 17:19 ` Greg KH
2019-01-16 19:27 ` David Long
2019-01-16 19:33 ` Greg KH
2019-01-16 19:40 ` David Long
2019-01-16 19:48 ` Greg KH
2019-01-16 19:49 ` Russell King - ARM Linux admin
2019-01-18 16:07 ` Greg KH
2019-01-18 20:24 ` David Long
2019-01-19 8:08 ` Greg KH
2019-01-19 9:56 ` Russell King - ARM Linux admin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190110175150.5239-18-dave.long@linaro.org \
--to=dave.long@linaro.org \
--cc=broonie@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=julien.thierry@arm.com \
--cc=linux@armlinux.org.uk \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=stable@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).