Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/x86/mov_ss_trap: Fix the SYSENTER test

For reasons that I haven't quite fully diagnosed, running
mov_ss_trap_32 on a 32-bit kernel results in an infinite loop in
userspace. This appears to be because the hacky SYSENTER test
doesn't segfault as desired; instead it corrupts the program state
such that it infinite loops.

Fix it by explicitly clearing EBP before doing SYSENTER. This will
give a more reliable segfault.

Fixes: 59c2a7226fc5 ("x86/selftests: Add mov_to_ss test")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@kernel.org

authored by

Andy Lutomirski and committed by
Peter Zijlstra
8caa016b 89542907

+2 -1
+2 -1
tools/testing/selftests/x86/mov_ss_trap.c
··· 257 257 err(1, "sigaltstack"); 258 258 sethandler(SIGSEGV, handle_and_longjmp, SA_RESETHAND | SA_ONSTACK); 259 259 nr = SYS_getpid; 260 - asm volatile ("mov %[ss], %%ss; SYSENTER" : "+a" (nr) 260 + /* Clear EBP first to make sure we segfault cleanly. */ 261 + asm volatile ("xorl %%ebp, %%ebp; mov %[ss], %%ss; SYSENTER" : "+a" (nr) 261 262 : [ss] "m" (ss) : "flags", "rcx" 262 263 #ifdef __x86_64__ 263 264 , "r11"