diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2022-04-20 09:46:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-25 09:10:40 +0200 |
| commit | 047794b3cfaff4313f379d0cb0509f1c0b972e26 (patch) | |
| tree | be59395b45f5d699bf33f95b9223ee723becf440 | |
| parent | 0569702c238290924fc1c7c6954258aa4a5fd649 (diff) | |
| download | linux-stable-047794b3cfaff4313f379d0cb0509f1c0b972e26.tar.gz linux-stable-047794b3cfaff4313f379d0cb0509f1c0b972e26.tar.bz2 linux-stable-047794b3cfaff4313f379d0cb0509f1c0b972e26.zip | |
ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
[ Upstream commit 3cfb3019979666bdf33a1010147363cf05e0f17b ]
In Thumb2, 'b . + 4' produces a branch instruction that uses a narrow
encoding, and so it does not jump to the following instruction as
expected. So use W(b) instead.
Fixes: 6c7cb60bff7a ("ARM: fix Thumb2 regression with Spectre BHB")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index a929b6acb149..d779cd1a3b0c 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1067,7 +1067,7 @@ vector_bhb_loop8_\name: @ bhb workaround mov r0, #8 -3: b . + 4 +3: W(b) . + 4 subs r0, r0, #1 bne 3b dsb |