diff options
author | kib <kib@FreeBSD.org> | 2015-01-18 11:54:20 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2015-01-18 11:54:20 +0000 |
commit | 7fe8fbec77343dc12cd90833d80eb7f721248bc7 (patch) | |
tree | 0e4ae5740dfb6ba34a4755307529abeee008c52c /lib/libc/gen/pause.c | |
parent | 5846d19730e47a408fae1ccea41b50ccb351b403 (diff) | |
download | FreeBSD-src-7fe8fbec77343dc12cd90833d80eb7f721248bc7.zip FreeBSD-src-7fe8fbec77343dc12cd90833d80eb7f721248bc7.tar.gz |
Fix known issues which blow up the process after dlopen("libthr.so")
(or loading a dso linked to libthr.so into process which was not
linked against threading library).
MFC r276630:
Remove interposing, fix malloc, reinstall signal handlers wrappers on
libthr load.
MFC r276681:
Avoid calling internal libc function through PLT or accessing data
though GOT.
MFC r277032:
Reduce the size of the interposing table and amount of
cancellation-handling code in the libthr.
MFC note:
r276646 ("do not erronously export 'openat' symbol from rtld") is not
applicable to stable/10 yet, since PATHFDS support was not merged.
Diffstat (limited to 'lib/libc/gen/pause.c')
-rw-r--r-- | lib/libc/gen/pause.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c index 51706cf..ef48c1c 100644 --- a/lib/libc/gen/pause.c +++ b/lib/libc/gen/pause.c @@ -33,10 +33,10 @@ static char sccsid[] = "@(#)pause.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "namespace.h" #include <signal.h> #include <unistd.h> -#include "un-namespace.h" + +#include "libc_private.h" /* * Backwards compatible pause. @@ -46,9 +46,10 @@ __pause(void) { sigset_t oset; - if (_sigprocmask(SIG_BLOCK, NULL, &oset) == -1) + if (sigprocmask(SIG_BLOCK, NULL, &oset) == -1) return (-1); - return (_sigsuspend(&oset)); + return (sigsuspend(&oset)); } + __weak_reference(__pause, pause); __weak_reference(__pause, _pause); |