aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorAlexander Kabaev <kan@FreeBSD.org>2016-01-27 20:20:37 +0000
committerAlexander Kabaev <kan@FreeBSD.org>2016-01-27 20:20:37 +0000
commitef2c2a692b75d644549827b3aaa9f1736940fe85 (patch)
treedfec85a88b477d2fb2b2afcf3c2a958a78d7f509 /libexec
parenta2e4e33f34a157f83791a81735ba58783c6c6e61 (diff)
Notes
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rtld-elf/rtld.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 863fe25f619a8..912358c0c1d13 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -3533,11 +3533,9 @@ dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
TAILQ_INSERT_AFTER(&obj_list, obj, &marker, next);
rtld_fill_dl_phdr_info(obj, &phdr_info);
lock_release(rtld_bind_lock, &bind_lockstate);
- lock_release(rtld_phdr_lock, &phdr_lockstate);
error = callback(&phdr_info, sizeof phdr_info, param);
- wlock_acquire(rtld_phdr_lock, &phdr_lockstate);
rlock_acquire(rtld_bind_lock, &bind_lockstate);
obj = globallist_next(&marker);
TAILQ_REMOVE(&obj_list, &marker, next);
@@ -3551,9 +3549,9 @@ dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
if (error == 0) {
rtld_fill_dl_phdr_info(&obj_rtld, &phdr_info);
lock_release(rtld_bind_lock, &bind_lockstate);
- lock_release(rtld_phdr_lock, &phdr_lockstate);
error = callback(&phdr_info, sizeof(phdr_info), param);
}
+ lock_release(rtld_phdr_lock, &phdr_lockstate);
return (error);
}