1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00

mtrace: Fix output with PIE and ASLR [BZ #22716]

Record only the relative address of the caller in mtrace file.  Use
LD_TRACE_PRELINKING to get the executable as well as binary vs
executable load offsets so that we may compute a base to add to the
relative address in the mtrace file.  This allows us to get a valid
address to pass to addr2line in all cases.

Fixes BZ #22716.

Co-authored-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Andreas Schwab <schwab@linux-m68k.org>
Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Siddhesh Poyarekar
2021-08-23 08:11:54 +05:30
parent 78c9ec9000
commit f2e33c3268
2 changed files with 10 additions and 11 deletions

View File

@@ -65,9 +65,9 @@ tr_where (const void *caller, Dl_info *info)
offset);
}
fprintf (mallstream, "@ %s%s%s[%p] ", info->dli_fname ? : "",
info->dli_fname ? ":" : "",
buf, caller);
fprintf (mallstream, "@ %s%s%s[0x%" PRIxPTR "] ",
info->dli_fname ? : "", info->dli_fname ? ":" : "", buf,
caller - info->dli_fbase);
}
else
fprintf (mallstream, "@ [%p] ", caller);