diff options
| author | Rich Felker <dalias@aerifal.cx> | 2017-04-11 22:10:52 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2017-04-11 22:10:52 -0400 |
| commit | b3751c3282e3fbae4b97cb4f29031df9bc6e0745 (patch) | |
| tree | 64d6d82b860a7ee440fc5b6500adfed690dee3e0 /src/ldso | |
| parent | 1ca597551bab424a1302938dd3504ddf73904efd (diff) | |
| download | musl-b3751c3282e3fbae4b97cb4f29031df9bc6e0745.tar.gz musl-b3751c3282e3fbae4b97cb4f29031df9bc6e0745.tar.bz2 musl-b3751c3282e3fbae4b97cb4f29031df9bc6e0745.tar.xz musl-b3751c3282e3fbae4b97cb4f29031df9bc6e0745.zip | |
fix dl_iterate_phdr in static PIE binaries
analogous to commit 5bf7eba213cacc4c1220627c91c28deff2ffecda, use of
AT_PHDR/PT_PHDR does not actually work to find the program base, and
the method with _DYNAMIC vs PT_DYNAMIC must be used as an alternative.
patch by Shiz, along with testing to confirm that this fixes unwinding
in static PIE.
Diffstat (limited to 'src/ldso')
| -rw-r--r-- | src/ldso/dl_iterate_phdr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ldso/dl_iterate_phdr.c b/src/ldso/dl_iterate_phdr.c index e55cbf76..f3160ef4 100644 --- a/src/ldso/dl_iterate_phdr.c +++ b/src/ldso/dl_iterate_phdr.c @@ -4,6 +4,9 @@ #define AUX_CNT 38 +__attribute__((__weak__, __visibility__("hidden"))) +extern const size_t _DYNAMIC[]; + static int static_dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data) { unsigned char *p; @@ -20,6 +23,8 @@ static int static_dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size phdr = (void *)p; if (phdr->p_type == PT_PHDR) base = aux[AT_PHDR] - phdr->p_vaddr; + if (phdr->p_type == PT_DYNAMIC && _DYNAMIC) + base = (size_t)_DYNAMIC - phdr->p_vaddr; if (phdr->p_type == PT_TLS) tls_phdr = phdr; } |