diff options
| author | Dave Hansen <dave.hansen@linux.intel.com> | 2024-03-12 07:27:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-03 15:11:58 +0200 |
| commit | 2f564056feda54c0c9aac310806b55024ddc37c5 (patch) | |
| tree | 8b470f1bbe4a2e113a6826a4e32671116bcde8b7 | |
| parent | b75a45fe97bd438598a2fc27a769d472f9513d9e (diff) | |
| download | linux-stable-2f564056feda54c0c9aac310806b55024ddc37c5.tar.gz linux-stable-2f564056feda54c0c9aac310806b55024ddc37c5.tar.bz2 linux-stable-2f564056feda54c0c9aac310806b55024ddc37c5.zip | |
Revert "x86/bugs: Use fixed addressing for VERW operand"
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 <dave.hansen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/include/asm/nospec-branch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 77b99dc6f7c3..4e33cc834bf8 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -332,7 +332,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__ */ |