Skip to content

Commit 2e2e514

Browse files
pa1guptahansendc
authored andcommitted
x86/entry_32: Do not clobber user EFLAGS.ZF
Opportunistic SYSEXIT executes VERW to clear CPU buffers after user EFLAGS are restored. This can clobber user EFLAGS.ZF. Move CLEAR_CPU_BUFFERS before the user EFLAGS are restored. This ensures that the user EFLAGS.ZF is not clobbered. Closes: https://lore.kernel.org/lkml/yVXwe8gvgmPADpRB6lXlicS2fcHoV5OHHxyuFbB_MEleRPD7-KhGe5VtORejtPe-KCkT8Uhcg5d7-IBw4Ojb4H7z5LQxoZylSmJ8KNL3A8o=@protonmail.com/ Fixes: a0e2dab ("x86/entry_32: Add VERW just before userspace transition") Reported-by: Jari Ruusu <jariruusu@protonmail.com> Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc:stable@vger.kernel.org Link: https://lore.kernel.org/all/20240925-fix-dosemu-vm86-v7-1-1de0daca2d42%40linux.intel.com
1 parent d5fd042 commit 2e2e514

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/entry/entry_32.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,8 @@ SYM_FUNC_START(entry_SYSENTER_32)
871871

872872
/* Now ready to switch the cr3 */
873873
SWITCH_TO_USER_CR3 scratch_reg=%eax
874+
/* Clobbers ZF */
875+
CLEAR_CPU_BUFFERS
874876

875877
/*
876878
* Restore all flags except IF. (We restore IF separately because
@@ -881,7 +883,6 @@ SYM_FUNC_START(entry_SYSENTER_32)
881883
BUG_IF_WRONG_CR3 no_user_check=1
882884
popfl
883885
popl %eax
884-
CLEAR_CPU_BUFFERS
885886

886887
/*
887888
* Return back to the vDSO, which will pop ecx and edx.

0 commit comments

Comments
 (0)