From: Greg Kroah-Hartman Date: Wed, 9 Mar 2022 21:19:18 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.9.306~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=346f7b294bf22250470fd615fea161d5b8ddcf7f;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..1109e51a378 --- /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)" +Date: Wed, 9 Mar 2022 19:08:42 +0000 +Subject: ARM: fix co-processor register typo + +From: Russell King (Oracle) + +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 +Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround") +Signed-off-by: Russell King (Oracle) +Acked-by: Catalin Marinas +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + 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 fce99c7504f..c849a5c35ba 100644 --- 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