From a11efbd046fd86036398aca5823b69c81d61c5d5 Mon Sep 17 00:00:00 2001 From: Jeremie Koenig Date: Wed, 5 Dec 2018 18:50:21 +0000 Subject: [PATCH] Small signal fixes 22e7268 Hurd signals: fix sigwait for pending signals da8bf5e Hurd signals: clear the pending mask in fork and spawn 8e87205 Hurd signals: don't drop blocked ignored signals Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name tg-hurdsig-fixes-2.diff --- hurd/hurdsig.c | 4 +--- sysdeps/mach/hurd/fork.c | 4 +++- sysdeps/mach/hurd/spawni.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index e15ad88ce..540239160 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -914,9 +914,7 @@ post_signal (struct hurd_sigstate *ss, } /* Handle receipt of a blocked signal, or any signal while stopped. */ - if (act != ignore && /* Signals ignored now are forgotten now. */ - __sigismember (&blocked, signo) || - (signo != SIGKILL && _hurd_stopped)) + if (__sigismember (&blocked, signo) || (signo != SIGKILL && _hurd_stopped)) { mark_pending (); act = ignore; diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c index 3d8e45df1..fb60c8cc9 100644 --- a/sysdeps/mach/hurd/fork.c +++ b/sysdeps/mach/hurd/fork.c @@ -655,8 +655,10 @@ __fork (void) err = __USEPORT (PROC, __proc_getpids (port, &_hurd_pid, &_hurd_ppid, &_hurd_orphaned)); - /* Forking clears the trace flag. */ + /* Forking clears the trace flag and pending masks. */ __sigemptyset (&_hurdsig_traced); + __sigemptyset (&_hurd_global_sigstate->pending); + __sigemptyset (&ss->pending); /* Release malloc locks. */ _hurd_malloc_fork_child (); diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c index d7db75e16..e885ca880 100644 --- a/sysdeps/mach/hurd/spawni.c +++ b/sysdeps/mach/hurd/spawni.c @@ -243,7 +243,7 @@ __spawni (pid_t *pid, const char *file, _hurd_sigstate_lock (ss); ints[INIT_SIGMASK] = ss->blocked; - ints[INIT_SIGPENDING] = _hurd_sigstate_pending (ss); /* XXX really? */ + ints[INIT_SIGPENDING] = 0; ints[INIT_SIGIGN] = 0; /* Unless we were asked to reset all handlers to SIG_DFL, pass down the set of signals that were set to SIG_IGN. */ -- 2.30.2