diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2018-07-21 22:15:48 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2018-07-21 22:15:48 +0000 |
| commit | 5aa9b11b613f85cde959ec3b9ba4be0128cb48c3 (patch) | |
| tree | 9fb4ef99863436e69e6d16c25ca0579e8fabb0bf /lib/libproc | |
| parent | d76b9890045dfa217a52c1cae469d4794ad30a1c (diff) | |
| download | src-test-5aa9b11b613f85cde959ec3b9ba4be0128cb48c3.tar.gz src-test-5aa9b11b613f85cde959ec3b9ba4be0128cb48c3.zip | |
Take the mapping's segment offset into account when resolving symbols.
Reported by: Jenkins, via asomers
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=336592
Diffstat (limited to 'lib/libproc')
| -rw-r--r-- | lib/libproc/proc_sym.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c index 9539425449490..5901379b1582c 100644 --- a/lib/libproc/proc_sym.c +++ b/lib/libproc/proc_sym.c @@ -520,7 +520,8 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name, } file = mapping->file; - off = file->ehdr.e_type == ET_DYN ? mapping->map.pr_vaddr : 0; + off = file->ehdr.e_type == ET_DYN ? + mapping->map.pr_vaddr - mapping->map.pr_offset : 0; if (addr < off) return (ENOENT); addr -= off; @@ -623,7 +624,8 @@ proc_name2sym(struct proc_handle *p, const char *object, const char *symbol, } file = mapping->file; - off = file->ehdr.e_type == ET_DYN ? mapping->map.pr_vaddr : 0; + off = file->ehdr.e_type == ET_DYN ? + mapping->map.pr_vaddr - mapping->map.pr_offset : 0; error = lookup_symbol_by_name(file->elf, &file->dynsymtab, symbol, symcopy, si); |