diff options
| author |   dhartmei <dhartmei@openbsd.org> | 2002-09-14 22:03:14 +0000 |
|---|---|---|
| committer | dhartmei <dhartmei@openbsd.org> | 2002-09-14 22:03:14 +0000 |
| commit | 8d62ee40dc28d335867f292dd8aab66f53e20b5b (patch) | |
| tree | ad54f039e1d7d49a8f9d2f8fe09f8b447e2e743f /lib/libc/stdlib/abort.c | |
| parent | recognize AppleKiwi (diff) | |
| download | wireguard-openbsd-8d62ee40dc28d335867f292dd8aab66f53e20b5b.tar.xz wireguard-openbsd-8d62ee40dc28d335867f292dd8aab66f53e20b5b.zip | |
Move __cleanup into mprotect'ed page to prevent unintentional modifications
similar to the atexit handlers. Idea and help deraadt@, ok deraadt@
Diffstat (limited to 'lib/libc/stdlib/abort.c')
| -rw-r--r-- | lib/libc/stdlib/abort.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c index 41a9f0f48bb..7057f9b1ad0 100644 --- a/lib/libc/stdlib/abort.c +++ b/lib/libc/stdlib/abort.c @@ -32,19 +32,19 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: abort.c,v 1.7 2001/08/12 12:03:01 heko Exp $"; +static char *rcsid = "$OpenBSD: abort.c,v 1.8 2002/09/14 22:03:14 dhartmei Exp $"; #endif /* LIBC_SCCS and not lint */ #include <signal.h> #include <stdlib.h> #include <unistd.h> #include "thread_private.h" - -void (*__cleanup)(); +#include "atexit.h" void abort() { + struct atexit *p = __atexit; static int cleanup_called = 0; sigset_t mask; @@ -64,9 +64,13 @@ abort() /* * POSIX requires we flush stdio buffers on abort */ - if (cleanup_called == 0 && __cleanup != NULL) { - cleanup_called = 1; - (*__cleanup)(); + if (cleanup_called == 0) { + while (p != NULL && p->next != NULL) + p = p->next; + if (p != NULL && p->fns[0] != NULL) { + cleanup_called = 1; + (*p->fns[0])(); + } } (void)kill(getpid(), SIGABRT); |