diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-05-02 04:57:02 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-05-02 04:57:02 +0000 |
| commit | 64bbd9e4628abe8823de2913a59d94d90d53e524 (patch) | |
| tree | d0cb7c94b69ee863c7bf83e9259e9b2a17deb654 /libexec/ld.so/amd64 | |
| parent | b4b6194a60b2e4ac571bb4b5a0ce6d006f8d9a32 (diff) | |
Combine the signal mask handling into _dl_thread_bind_lock(), as it's MI.
ok drahn@
Diffstat (limited to 'libexec/ld.so/amd64')
| -rw-r--r-- | libexec/ld.so/amd64/rtld_machine.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libexec/ld.so/amd64/rtld_machine.c b/libexec/ld.so/amd64/rtld_machine.c index dcf9669b983..6dad018143a 100644 --- a/libexec/ld.so/amd64/rtld_machine.c +++ b/libexec/ld.so/amd64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.14 2008/04/09 21:45:26 kurt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.15 2010/05/02 04:57:01 guenther Exp $ */ /* * Copyright (c) 2002,2004 Dale Rahn @@ -338,7 +338,7 @@ _dl_bind(elf_object_t *object, int index) const Elf_Sym *sym, *this; const char *symn; Elf_Addr ooff, newval; - sigset_t omask, nmask; + sigset_t savedmask; rel = (Elf_RelA *)(object->Dyn.info[DT_JMPREL]); @@ -362,9 +362,7 @@ _dl_bind(elf_object_t *object, int index) /* if GOT is protected, allow the write */ if (object->got_size != 0) { - sigfillset(&nmask); - _dl_sigprocmask(SIG_BLOCK, &nmask, &omask); - _dl_thread_bind_lock(0); + _dl_thread_bind_lock(0, &savedmask); _dl_mprotect((void*)object->got_start, object->got_size, PROT_READ|PROT_WRITE); } @@ -375,8 +373,7 @@ _dl_bind(elf_object_t *object, int index) if (object->got_size != 0) { _dl_mprotect((void*)object->got_start, object->got_size, PROT_READ); - _dl_thread_bind_lock(1); - _dl_sigprocmask(SIG_SETMASK, &omask, NULL); + _dl_thread_bind_lock(1, &savedmask); } return(newval); |