Skip to content

Commit 532a0c5

Browse files
committed
Revert "x86/bugs: Use fixed addressing for VERW operand"
This was reverts commit 8009479. 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>
1 parent f0551af commit 532a0c5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/include/asm/nospec-branch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
* Note: Only the memory operand variant of VERW clears the CPU buffers.
324324
*/
325325
.macro CLEAR_CPU_BUFFERS
326-
ALTERNATIVE "", __stringify(verw mds_verw_sel), X86_FEATURE_CLEAR_CPU_BUF
326+
ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF
327327
.endm
328328

329329
#else /* __ASSEMBLY__ */

0 commit comments

Comments
 (0)