aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2022-09-12 08:30:36 -0400
committerRich Felker <dalias@aerifal.cx>2022-09-12 08:30:36 -0400
commit6f3ead0ae16deb9f0004b275e29a276c9712ee3c (patch)
treec96c11e1435f0bab6b15bd07e304cdc7df9f97ed
parent25085c85a0055a94919bf522c96803db7c885431 (diff)
downloadmusl-6f3ead0ae16deb9f0004b275e29a276c9712ee3c.tar.gz
musl-6f3ead0ae16deb9f0004b275e29a276c9712ee3c.tar.xz
musl-6f3ead0ae16deb9f0004b275e29a276c9712ee3c.zip
process DT_RELR relocations in ldso-startup/static-pie
commit d32dadd60efb9d3b255351a3b532f8e4c3dd0db1 added DT_RELR processing for programs and shared libraries processed by the dynamic linker, but left them unsupported in the dynamic linker itseld and in static pie binaries, which self-relocate via code in dlstart.c. add the equivalent processing to this code path so that there are not arbitrary restrictions on where the new packed relative relocation form can be used.
-rw-r--r--ldso/dlstart.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/ldso/dlstart.c b/ldso/dlstart.c
index 20d50f2c..259f5e18 100644
--- a/ldso/dlstart.c
+++ b/ldso/dlstart.c
@@ -140,6 +140,21 @@ hidden void _dlstart_c(size_t *sp, size_t *dynv)
size_t *rel_addr = (void *)(base + rel[0]);
*rel_addr = base + rel[2];
}
+
+ rel = (void *)(base+dyn[DT_RELR]);
+ rel_size = dyn[DT_RELRSZ];
+ size_t *relr_addr = 0;
+ for (; rel_size; rel++, rel_size-=sizeof(size_t)) {
+ if ((rel[0]&1) == 0) {
+ relr_addr = (void *)(base + rel[0]);
+ *relr_addr++ += base;
+ } else {
+ for (size_t i=0, bitmap=rel[0]; bitmap>>=1; i++)
+ if (bitmap&1)
+ relr_addr[i] += base;
+ relr_addr += 8*sizeof(size_t)-1;
+ }
+ }
#endif
stage2_func dls2;