Author: bdrewery
Date: Tue Jan 24 16:47:06 2017
New Revision: 312700
URL: https://svnweb.freebsd.org/changeset/base/312700
Log:
MFC r310025:
Take write lock for rtld_bind before modifying obj_list in
dl_iterate_phdr().
Modified:
stable/10/libexec/rtld-elf/rtld.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/10/libexec/rtld-elf/rtld.c Tue Jan 24 16:13:59 2017
(r312699)
+++ stable/10/libexec/rtld-elf/rtld.c Tue Jan 24 16:47:06 2017
(r312700)
@@ -3470,7 +3470,7 @@ dl_iterate_phdr(__dl_iterate_hdr_callbac
error = 0;
wlock_acquire(rtld_phdr_lock, &phdr_lockstate);
- rlock_acquire(rtld_bind_lock, &bind_lockstate);
+ wlock_acquire(rtld_bind_lock, &bind_lockstate);
for (obj = globallist_curr(TAILQ_FIRST(&obj_list)); obj != NULL;) {
TAILQ_INSERT_AFTER(&obj_list, obj, &marker, next);
rtld_fill_dl_phdr_info(obj, &phdr_info);
@@ -3478,7 +3478,7 @@ dl_iterate_phdr(__dl_iterate_hdr_callbac
error = callback(&phdr_info, sizeof phdr_info, param);
- rlock_acquire(rtld_bind_lock, &bind_lockstate);
+ wlock_acquire(rtld_bind_lock, &bind_lockstate);
obj = globallist_next(&marker);
TAILQ_REMOVE(&obj_list, &marker, next);
if (error != 0) {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
