selftests/x86: Add a test to detect infinite SIGTRAP handler loop
commit f287822688eeb44ae1cf6ac45701d965efc33218 upstream. When FRED is enabled, if the Trap Flag (TF) is set without an external debugger attached, it can lead to an infinite loop in the SIGTRAP handler. To avoid this, the software event flag in the augmented SS must be cleared, ensuring that no single-step trap remains pending when ERETU completes. This test checks for that specific scenario—verifying whether the kernel correctly prevents an infinite SIGTRAP loop in this edge case when FRED is enabled. The test should _always_ pass with IDT event delivery, thus no need to disable the test even when FRED is not enabled. Signed-off-by: Xin Li (Intel) <xin@zytor.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Tested-by: Sohil Mehta <sohil.mehta@intel.com> Cc:stable@vger.kernel.org Link: https://lore.kernel.org/all/20250609084054.2083189-3-xin%40zytor.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
372b511e93
commit
2a03531c00
@@ -12,7 +12,7 @@ CAN_BUILD_WITH_NOPIE := $(shell ./check_cc.sh "$(CC)" trivial_program.c -no-pie)
|
|||||||
|
|
||||||
TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \
|
TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \
|
||||||
check_initial_reg_state sigreturn iopl ioperm \
|
check_initial_reg_state sigreturn iopl ioperm \
|
||||||
test_vsyscall mov_ss_trap \
|
test_vsyscall mov_ss_trap sigtrap_loop \
|
||||||
syscall_arg_fault fsgsbase_restore sigaltstack
|
syscall_arg_fault fsgsbase_restore sigaltstack
|
||||||
TARGETS_C_32BIT_ONLY := entry_from_vm86 test_syscall_vdso unwind_vdso \
|
TARGETS_C_32BIT_ONLY := entry_from_vm86 test_syscall_vdso unwind_vdso \
|
||||||
test_FCMOV test_FCOMI test_FISTTP \
|
test_FCMOV test_FCOMI test_FISTTP \
|
||||||
|
101
tools/testing/selftests/x86/sigtrap_loop.c
Normal file
101
tools/testing/selftests/x86/sigtrap_loop.c
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
// SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2025 Intel Corporation
|
||||||
|
*/
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
|
#include <err.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/ucontext.h>
|
||||||
|
|
||||||
|
#ifdef __x86_64__
|
||||||
|
# define REG_IP REG_RIP
|
||||||
|
#else
|
||||||
|
# define REG_IP REG_EIP
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *), int flags)
|
||||||
|
{
|
||||||
|
struct sigaction sa;
|
||||||
|
|
||||||
|
memset(&sa, 0, sizeof(sa));
|
||||||
|
sa.sa_sigaction = handler;
|
||||||
|
sa.sa_flags = SA_SIGINFO | flags;
|
||||||
|
sigemptyset(&sa.sa_mask);
|
||||||
|
|
||||||
|
if (sigaction(sig, &sa, 0))
|
||||||
|
err(1, "sigaction");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void sigtrap(int sig, siginfo_t *info, void *ctx_void)
|
||||||
|
{
|
||||||
|
ucontext_t *ctx = (ucontext_t *)ctx_void;
|
||||||
|
static unsigned int loop_count_on_same_ip;
|
||||||
|
static unsigned long last_trap_ip;
|
||||||
|
|
||||||
|
if (last_trap_ip == ctx->uc_mcontext.gregs[REG_IP]) {
|
||||||
|
printf("\tTrapped at %016lx\n", last_trap_ip);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the same IP is hit more than 10 times in a row, it is
|
||||||
|
* _considered_ an infinite loop.
|
||||||
|
*/
|
||||||
|
if (++loop_count_on_same_ip > 10) {
|
||||||
|
printf("[FAIL]\tDetected SIGTRAP infinite loop\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
loop_count_on_same_ip = 0;
|
||||||
|
last_trap_ip = ctx->uc_mcontext.gregs[REG_IP];
|
||||||
|
printf("\tTrapped at %016lx\n", last_trap_ip);
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
sethandler(SIGTRAP, sigtrap, 0);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set the Trap Flag (TF) to single-step the test code, therefore to
|
||||||
|
* trigger a SIGTRAP signal after each instruction until the TF is
|
||||||
|
* cleared.
|
||||||
|
*
|
||||||
|
* Because the arithmetic flags are not significant here, the TF is
|
||||||
|
* set by pushing 0x302 onto the stack and then popping it into the
|
||||||
|
* flags register.
|
||||||
|
*
|
||||||
|
* Four instructions in the following asm code are executed with the
|
||||||
|
* TF set, thus the SIGTRAP handler is expected to run four times.
|
||||||
|
*/
|
||||||
|
printf("[RUN]\tSIGTRAP infinite loop detection\n");
|
||||||
|
asm volatile(
|
||||||
|
#ifdef __x86_64__
|
||||||
|
/*
|
||||||
|
* Avoid clobbering the redzone
|
||||||
|
*
|
||||||
|
* Equivalent to "sub $128, %rsp", however -128 can be encoded
|
||||||
|
* in a single byte immediate while 128 uses 4 bytes.
|
||||||
|
*/
|
||||||
|
"add $-128, %rsp\n\t"
|
||||||
|
#endif
|
||||||
|
"push $0x302\n\t"
|
||||||
|
"popf\n\t"
|
||||||
|
"nop\n\t"
|
||||||
|
"nop\n\t"
|
||||||
|
"push $0x202\n\t"
|
||||||
|
"popf\n\t"
|
||||||
|
#ifdef __x86_64__
|
||||||
|
"sub $-128, %rsp\n\t"
|
||||||
|
#endif
|
||||||
|
);
|
||||||
|
|
||||||
|
printf("[OK]\tNo SIGTRAP infinite loop detected\n");
|
||||||
|
return 0;
|
||||||
|
}
|
Reference in New Issue
Block a user