From: John Marino <draco@marino.st>
Date: Sat, 30 Nov 2013 09:55:19 +0000 (+0100)
Subject: rtld: dl_iterate_phdr change
X-Git-Tag: v3.9.0~1088
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/7d311ee5e8979654775e8b55d3c322cf99cd4743

rtld: dl_iterate_phdr change

The dynamic linker needs to include itself when iterating over loaded
ELF objects in dl_iterate_phdr(3).

Taken by:
FreeBSD SVN 257811 (07 NOV 2013)
---

diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 968a526d13..581aaffa2f 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -3332,6 +3332,11 @@ dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
 		break;
 
     }
+    if (error == 0) {
+	rtld_fill_dl_phdr_info(&obj_rtld, &phdr_info);
+	error = callback(&phdr_info, sizeof(phdr_info), param);
+    }
+
     lock_release(rtld_bind_lock, &bind_lockstate);
     lock_release(rtld_phdr_lock, &phdr_lockstate);