mirror of
https://github.com/sheumann/hush.git
synced 2024-06-01 00:41:33 +00:00
656769d136
The sigprocmask implementation in GNO 2.0.6 libc has bugs that cause it to never actually unblock signals that have been blocked. This was causing many signals to remain blocked when they shouldn't be, particularly after running signal handlers. This problem combined with a kernel issue (wait() calls won't recognize that a child has finished if SIGCHLD is blocked) to cause hangs in certain conditions. This patch works around these issues by defining our own non-buggy version of sigprocmask in place of libc's.
91 lines
1.6 KiB
C
91 lines
1.6 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Utility routines.
|
|
*
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
|
* Copyright (C) 2006 Rob Landley
|
|
* Copyright (C) 2006 Denys Vlasenko
|
|
*
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
/* All known arches use small ints for signals */
|
|
smallint bb_got_signal;
|
|
|
|
int FAST_FUNC sigprocmask_allsigs(int how)
|
|
{
|
|
sigset_t set;
|
|
sigfillset(&set);
|
|
return sigprocmask(how, &set, NULL);
|
|
}
|
|
|
|
void FAST_FUNC bb_signals(long int sigs, sig_t f)
|
|
{
|
|
int sig_no = 0;
|
|
long int bit = 1;
|
|
|
|
while (sigs) {
|
|
if (sigs & bit) {
|
|
sigs -= bit;
|
|
signal(sig_no, f);
|
|
}
|
|
sig_no++;
|
|
bit <<= 1;
|
|
}
|
|
}
|
|
|
|
void FAST_FUNC sig_unblock(int sig)
|
|
{
|
|
sigset_t ss;
|
|
sigemptyset(&ss);
|
|
sigaddset(&ss, sig);
|
|
sigprocmask(SIG_UNBLOCK, &ss, NULL);
|
|
}
|
|
|
|
/* Assuming the sig is fatal */
|
|
void FAST_FUNC kill_myself_with_sig(int sig)
|
|
{
|
|
signal(sig, SIG_DFL);
|
|
sig_unblock(sig);
|
|
signal_parent_to_resume();
|
|
raise(sig);
|
|
_exit(sig | 128); /* Should not reach it */
|
|
}
|
|
|
|
#ifdef __GNO__
|
|
/* Include our own version of sigprocmask, because the one in
|
|
* GNO 2.0.6 libc is broken for SIG_SETMASK and SIG_UNBLOCK cases
|
|
* (it will never unblock any signals). */
|
|
int sigprocmask(int how, const sigset_t *set, sigset_t *oset)
|
|
{
|
|
sigset_t oldmask;
|
|
|
|
if (set) {
|
|
switch (how) {
|
|
case SIG_BLOCK:
|
|
oldmask = sigblock(*set);
|
|
break;
|
|
case SIG_SETMASK:
|
|
oldmask = sigsetmask(*set);
|
|
break;
|
|
case SIG_UNBLOCK:
|
|
oldmask = sigblock(0);
|
|
sigsetmask(oldmask & ~*set);
|
|
break;
|
|
default:
|
|
errno = EINVAL;
|
|
return -1;
|
|
}
|
|
} else if (oset) {
|
|
oldmask = sigblock(0);
|
|
}
|
|
|
|
if (oset)
|
|
*oset = oldmask;
|
|
|
|
return 0;
|
|
}
|
|
#endif
|