diff mbox series

[4.9,19/20] ARM: fix Thumb2 regression with Spectre BHB

Message ID	20220314112731.062892656@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>, "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>, Linus Torvalds <torvalds@linux-foundation.org> Subject: [PATCH 4.9 19/20] ARM: fix Thumb2 regression with Spectre BHB Date: Mon, 14 Mar 2022 12:34:20 +0100 Message-Id: <20220314112731.062892656@linuxfoundation.org> In-Reply-To: <20220314112730.388955049@linuxfoundation.org> References: <20220314112730.388955049@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,02/20] qed: return status of qed_iov_get_link [4.9,03/20] ethernet: Fix error handling in xemaclite_of_probe [4.9,04/20] net: ethernet: lpc_eth: Handle error for clk_enable [4.9,05/20] ax25: Fix NULL pointer dereference in ax25_kill_by_device [4.9,06/20] net/mlx5: Fix size field in bufferx_reg struct [4.9,07/20] NFC: port100: fix use-after-free in port100_send_complete [4.9,08/20] gpio: ts4900: Do not set DAT and OE together [4.9,09/20] sctp: fix kernel-infoleak for SCTP sockets [4.9,10/20] net-sysfs: add check for netdevice being present to speed_show [4.9,11/20] Revert "xen-netback: Check for hotplug-status existence before watching" [4.9,12/20] tracing: Ensure trace buffer is at least 4096 bytes large [4.9,13/20] selftests/memfd: clean up mapping in mfd_fail_write [4.9,14/20] ARM: Spectre-BHB: provide empty stub for non-config [4.9,15/20] staging: gdm724x: fix use after free in gdm_lte_rx() [4.9,16/20] KVM: arm64: Reset PMC_EL0 to avoid a panic() on systems with no PMU [4.9,17/20] batman-adv: Request iflink once in batadv-on-batadv check [4.9,18/20] batman-adv: Dont expect inter-netns unique iflink indices [4.9,19/20] ARM: fix Thumb2 regression with Spectre BHB [4.9,20/20] btrfs: unlock newly allocated extent buffer after error

Commit Message

gregkh@linuxfoundation.org March 14, 2022, 11:34 a.m. UTC

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

commit 6c7cb60bff7aec24b834343ff433125f469886a3 upstream.

When building for Thumb2, the vectors make use of a local label. Sadly,
the Spectre BHB code also uses a local label with the same number which
results in the Thumb2 reference pointing at the wrong place. Fix this
by changing the number used for the Spectre BHB local label.

Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround")
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/arm/kernel/entry-armv.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -1074,9 +1074,9 @@  vector_bhb_loop8_\name:
 
 	@ bhb workaround
 	mov	r0, #8
-1:	b	. + 4
+3:	b	. + 4
 	subs	r0, r0, #1
-	bne	1b
+	bne	3b
 	dsb
 	isb
 	b	2b