aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-05-29 06:33:42 -0700
committerH.J. Lu <hjl.tools@gmail.com>2018-05-29 06:33:57 -0700
commit7f7b5d8ded77db90c1fbfeaaeb3d58b6db84da47 (patch)
treeb4ef8d98fe75f5047fbb33e20e66ab5ec5ef08bf
parente48903000b248f6cdc78238b006b86b63fcdbf8c (diff)
downloadglibc-7f7b5d8ded77db90c1fbfeaaeb3d58b6db84da47.tar
glibc-7f7b5d8ded77db90c1fbfeaaeb3d58b6db84da47.tar.gz
glibc-7f7b5d8ded77db90c1fbfeaaeb3d58b6db84da47.tar.bz2
glibc-7f7b5d8ded77db90c1fbfeaaeb3d58b6db84da47.zip
static-PIE: Update DT_DEBUG for debugger [BZ #23206]
This is needed to support debugging dlopened shared libraries in static PIE. [BZ #23206] * elf/dl-reloc-static-pie.c (_dl_relocate_static_pie): Initialize _r_debug and update DT_DEBUG for debugger. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-rw-r--r--ChangeLog6
-rw-r--r--elf/dl-reloc-static-pie.c16
2 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b9684f4875..efd0bec672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-29 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #23206]
+ * elf/dl-reloc-static-pie.c (_dl_relocate_static_pie): Initialize
+ _r_debug and update DT_DEBUG for debugger.
+
2018-05-29 Florian Weimer <fweimer@redhat.com>
* stdlib/Makefile (tst-strtod1i.out): Depend on generated locales.
diff --git a/elf/dl-reloc-static-pie.c b/elf/dl-reloc-static-pie.c
index bd2d516e5d..ab1ce0eacc 100644
--- a/elf/dl-reloc-static-pie.c
+++ b/elf/dl-reloc-static-pie.c
@@ -48,5 +48,21 @@ _dl_relocate_static_pie (void)
data access using the global offset table. */
ELF_DYNAMIC_RELOCATE (main_map, 0, 0, 0);
main_map->l_relocated = 1;
+
+ /* Initialize _r_debug. */
+ struct r_debug *r = _dl_debug_initialize (0, LM_ID_BASE);
+ r->r_state = RT_CONSISTENT;
+
+ /* Set up debugging before the debugger is notified for the first
+ time. */
+# ifdef ELF_MACHINE_DEBUG_SETUP
+ /* Some machines (e.g. MIPS) don't use DT_DEBUG in this way. */
+ ELF_MACHINE_DEBUG_SETUP (main_map, r);
+# else
+ if (main_map->l_info[DT_DEBUG] != NULL)
+ /* There is a DT_DEBUG entry in the dynamic section. Fill it in
+ with the run-time address of the r_debug structure */
+ main_map->l_info[DT_DEBUG]->d_un.d_ptr = (ElfW(Addr)) r;
+# endif
}
#endif