diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-08-23 08:11:54 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-08-23 08:14:22 +0530 |
| commit | f2e33c3268db9adf8e57e991676ed0d5ac74e8a8 (patch) | |
| tree | 8fc199103fff311829cb5ef8d18e81349295a506 /malloc/mtrace-impl.c | |
| parent | 78c9ec9000f873abe7a15a91b87080a2e4308260 (diff) | |
| download | glibc-f2e33c3268db9adf8e57e991676ed0d5ac74e8a8.tar.gz glibc-f2e33c3268db9adf8e57e991676ed0d5ac74e8a8.tar.xz glibc-f2e33c3268db9adf8e57e991676ed0d5ac74e8a8.zip | |
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>
Diffstat (limited to 'malloc/mtrace-impl.c')
| -rw-r--r-- | malloc/mtrace-impl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/malloc/mtrace-impl.c b/malloc/mtrace-impl.c index 83008ca18f..f5f19c265c 100644 --- a/malloc/mtrace-impl.c +++ b/malloc/mtrace-impl.c @@ -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); |