diff options
| author | kan <kan@FreeBSD.org> | 2016-01-27 20:20:37 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2016-01-27 20:20:37 +0000 |
| commit | 35f6152a71b342af29980776f503f4a20ad239bd (patch) | |
| tree | dfec85a88b477d2fb2b2afcf3c2a958a78d7f509 /libexec/rtld-elf | |
| parent | 259ddf80ecfd4b3c47d6baf7ed8b7f6882dae51d (diff) | |
| download | FreeBSD-src-35f6152a71b342af29980776f503f4a20ad239bd.zip FreeBSD-src-35f6152a71b342af29980776f503f4a20ad239bd.tar.gz | |
Do not unlock rtld_phdr_lock over callback invocations.
The dl_iterate_phdr consumer code in libgcc does not expect multiple
callbacks running concurrently. This was fixed once already in r178807,
but accidentally got reverted in r294373.
Diffstat (limited to 'libexec/rtld-elf')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 863fe25..912358c 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); } |
