4.14-stable patches

added patches:
	arm-fix-co-processor-register-typo.patch

diff --git a/queue-4.14/arm-fix-co-processor-register-typo.patch b/queue-4.14/arm-fix-co-processor-register-typo.patch
new file mode 100644 (file)
index 0000000..1109e51
--- /dev/null
+++ b/queue-4.14/arm-fix-co-processor-register-typo.patch
@@ -0,0 +1,34 @@
+From 33970b031dc4653cc9dc80f2886976706c4c8ef1 Mon Sep 17 00:00:00 2001
+From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
+Date: Wed, 9 Mar 2022 19:08:42 +0000
+Subject: ARM: fix co-processor register typo
+
+From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+
+commit 33970b031dc4653cc9dc80f2886976706c4c8ef1 upstream.
+
+In the recent Spectre BHB patches, there was a typo that is only
+exposed in certain configurations: mcr p15,0,XX,c7,r5,4 should have
+been mcr p15,0,XX,c7,c5,4
+
+Reported-by: kernel test robot <lkp@intel.com>
+Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround")
+Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+Acked-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/include/asm/assembler.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/include/asm/assembler.h
++++ b/arch/arm/include/asm/assembler.h
+@@ -116,7 +116,7 @@
+       .endm
+ 
+       .macro  isb, args
+-      mcr     p15, 0, r0, c7, r5, 4
++      mcr     p15, 0, r0, c7, c5, 4
+       .endm
+ #endif
+ 

diff --git a/queue-4.14/series b/queue-4.14/series
index fce99c7504f4579b1f0f8a107cb47dc2f398e878..c849a5c35ba826e3c3c399c83efa07ae77930e73 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -16,3 +16,4 @@ arm-use-loadaddr-to-get-load-address-of-sections.patch
 arm-spectre-bhb-workaround.patch
 arm-include-unprivileged-bpf-status-in-spectre-v2-reporting.patch
 arm-fix-build-error-when-bpf_syscall-is-disabled.patch
+arm-fix-co-processor-register-typo.patch