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/hppa | |
| 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/hppa')
| -rw-r--r-- | libexec/ld.so/hppa/rtld_machine.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libexec/ld.so/hppa/rtld_machine.c b/libexec/ld.so/hppa/rtld_machine.c index ab0714b8c21..e7e2b21ba4b 100644 --- a/libexec/ld.so/hppa/rtld_machine.c +++ b/libexec/ld.so/hppa/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.17 2010/01/03 22:18:04 kettenis Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.18 2010/05/02 04:57:01 guenther Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -418,7 +418,7 @@ _dl_bind(elf_object_t *object, int reloff) const char *symn; Elf_Addr value; Elf_RelA *rela; - sigset_t omask, nmask; + sigset_t savedmask; rela = (Elf_RelA *)object->dyn.jmprel + reloff; @@ -440,9 +440,7 @@ _dl_bind(elf_object_t *object, int reloff) /* if PLT+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); /* mprotect the actual modified region, not the whole plt */ _dl_mprotect((void*)addr, sizeof (Elf_Addr) * 2, PROT_READ|PROT_WRITE); |