MFC r257811 (by markj):

Include rtld itself when iterating over loaded ELF objects in
dl_iterate_phdr(3).

MFC r294373:
Do not call callbacks for dl_iterate_phdr(3) with the rtld bind and
phdr locks locked.

MFC r294470 (by kan):
Fix initlist_add_object invocation parameters.

MFC r294936 (by kan):
Do not unlock rtld_phdr_lock over callback invocations.

1 files changed, 2 insertions, 1 deletions

diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c
index 8f8311c..3c37b7f 100644
--- a/libexec/rtld-elf/debug.c
+++ b/libexec/rtld-elf/debug.c
@@ -62,7 +62,8 @@ dump_relocations (Obj_Entry *obj0)
 {
     Obj_Entry *obj;
 
-    for (obj = obj0; obj != NULL; obj = obj->next) {
+    for (obj = globallist_curr(obj0); obj != NULL;
+      obj = globallist_next(obj)) {
         dump_obj_relocations(obj);
     }
 }