motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-10 02:54:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-user: Simplify signal_init

Browse source 
Install the host signal handler at the same time we are
probing the target signals for SIG_IGN/SIG_DFL.  Ignore
unmapped target signals.

Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-08-22 21:20:47 -07:00
parent b60b91aa8f
commit 58c4e36c4e
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
linux-user/signal.c
View file

@ -558,10 +558,7 @@ static void signal_table_init(void)
void signal_init(void) void signal_init(void)
{ {
TaskState *ts = (TaskState *)thread_cpu->opaque; TaskState *ts = (TaskState *)thread_cpu->opaque;
struct sigaction act; struct sigaction act, oact;
struct sigaction oact;
int i;
int host_sig;
/* initialize signal conversion tables */ /* initialize signal conversion tables */
signal_table_init(); signal_table_init();
@ -572,23 +569,28 @@ void signal_init(void)
sigfillset(&act.sa_mask); sigfillset(&act.sa_mask);
act.sa_flags = SA_SIGINFO; act.sa_flags = SA_SIGINFO;
act.sa_sigaction = host_signal_handler; act.sa_sigaction = host_signal_handler;
for(i = 1; i <= TARGET_NSIG; i++) {
host_sig = target_to_host_signal(i); /*
sigaction(host_sig, NULL, &oact); * A parent process may configure ignored signals, but all other
if (oact.sa_sigaction == (void *)SIG_IGN) { * signals are default. For any target signals that have no host
sigact_table[i - 1]._sa_handler = TARGET_SIG_IGN; * mapping, set to ignore. For all core_dump_signal, install our
} else if (oact.sa_sigaction == (void *)SIG_DFL) { * host signal handler so that we may invoke dump_core_and_abort.
sigact_table[i - 1]._sa_handler = TARGET_SIG_DFL; * This includes SIGSEGV and SIGBUS, which are also need our signal
} * handler for paging and exceptions.
/* If there's already a handler installed then something has */
gone horribly wrong, so don't even try to handle that case. */ for (int tsig = 1; tsig <= TARGET_NSIG; tsig++) {
/* Install some handlers for our own use. We need at least int hsig = target_to_host_signal(tsig);
SIGSEGV and SIGBUS, to detect exceptions. We can not just abi_ptr thand = TARGET_SIG_IGN;
trap all signals because it affects syscall interrupt
behavior. But do trap all default-fatal signals. */ if (hsig < _NSIG) {
if (core_dump_signal(i)) { struct sigaction *iact = core_dump_signal(tsig) ? &act : NULL;
sigaction(host_sig, &act, NULL);
sigaction(hsig, iact, &oact);
if (oact.sa_sigaction != (void *)SIG_IGN) {
thand = TARGET_SIG_DFL;
}
} }
sigact_table[tsig - 1]._sa_handler = thand;
} }
} }