sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix signal handling for services on abort/exit

Browse source 
Change-Id: I970a25ae0dd52f0d928fda376296e7b39e3e17eb
This commit is contained in:
Lionel Sambuc 2013-02-28 15:41:39 +01:00
parent a9f55a2e46
commit b9674650f1
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libc/misc/stack_protector.c
View file

@ -86,7 +86,6 @@ __fail(const char *msg)
#ifdef _LIBC #ifdef _LIBC
struct syslog_data sdata = SYSLOG_DATA_INIT; struct syslog_data sdata = SYSLOG_DATA_INIT;
struct sigaction sa; struct sigaction sa;
#endif
sigset_t mask; sigset_t mask;
/* Immediately block all signal handlers from running code */ /* Immediately block all signal handlers from running code */
@ -94,7 +93,6 @@ __fail(const char *msg)
(void)sigdelset(&mask, SIGABRT); (void)sigdelset(&mask, SIGABRT);
(void)sigprocmask(SIG_BLOCK, &mask, NULL); (void)sigprocmask(SIG_BLOCK, &mask, NULL);
#ifdef _LIBC
/* This may fail on a chroot jail... */ /* This may fail on a chroot jail... */
syslog_ss(LOG_CRIT, &sdata, "%s", msg); syslog_ss(LOG_CRIT, &sdata, "%s", msg);
#else #else

8
lib/libc/stdlib/abort.c
View file

@ -43,6 +43,7 @@ __RCSID("$NetBSD: abort.c,v 1.15 2012/06/08 11:15:26 abs Exp $");
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#if defined(_LIBC)
extern void (*__cleanup)(void); extern void (*__cleanup)(void);
static int aborting = 0; static int aborting = 0;
@ -82,3 +83,10 @@ abort(void)
(void)raise(SIGABRT); (void)raise(SIGABRT);
_exit(1); _exit(1);
} }
#else
void
abort(void)
{
exit(1);
}
#endif /* defined(_LIBC) */