From: Greg Kroah-Hartman Date: Mon, 1 Apr 2024 13:19:48 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v6.7.12~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fabfab017d0a2b2c2dcd7d0e69f0672a9b3ce8b;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: revert-x86-bugs-use-fixed-addressing-for-verw-operand.patch --- diff --git a/queue-6.6/revert-x86-bugs-use-fixed-addressing-for-verw-operand.patch b/queue-6.6/revert-x86-bugs-use-fixed-addressing-for-verw-operand.patch new file mode 100644 index 00000000000..7d9bb2b33c4 --- /dev/null +++ b/queue-6.6/revert-x86-bugs-use-fixed-addressing-for-verw-operand.patch @@ -0,0 +1,36 @@ +From 532a0c57d7ff75e8f07d4e25cba4184989e2a241 Mon Sep 17 00:00:00 2001 +From: Dave Hansen +Date: Tue, 12 Mar 2024 07:27:57 -0700 +Subject: Revert "x86/bugs: Use fixed addressing for VERW operand" + +From: Dave Hansen + +commit 532a0c57d7ff75e8f07d4e25cba4184989e2a241 upstream. + +This was reverts commit 8009479ee919b9a91674f48050ccbff64eafedaa. + +It was originally in x86/urgent, but was deemed wrong so got zapped. +But in the meantime, x86/urgent had been merged into x86/apic to +resolve a conflict. I didn't notice the merge so didn't zap it +from x86/apic and it managed to make it up with the x86/apic +material. + +The reverted commit is known to cause some KASAN problems. + +Signed-off-by: Dave Hansen +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/include/asm/nospec-branch.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/include/asm/nospec-branch.h ++++ b/arch/x86/include/asm/nospec-branch.h +@@ -337,7 +337,7 @@ + * Note: Only the memory operand variant of VERW clears the CPU buffers. + */ + .macro CLEAR_CPU_BUFFERS +- ALTERNATIVE "", __stringify(verw mds_verw_sel), X86_FEATURE_CLEAR_CPU_BUF ++ ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF + .endm + + #else /* __ASSEMBLY__ */ diff --git a/queue-6.6/series b/queue-6.6/series index 4b12d87bab9..12f2d244be2 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -386,3 +386,4 @@ scsi-qla2xxx-fix-double-free-of-fcport.patch scsi-qla2xxx-change-debug-message-during-driver-unload.patch scsi-qla2xxx-delay-i-o-abort-on-pci-error.patch x86-bugs-use-fixed-addressing-for-verw-operand.patch +revert-x86-bugs-use-fixed-addressing-for-verw-operand.patch