d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take the mapping's segment offset into account when resolving symbols.

Browse Source 
Reported by:	Jenkins, via asomers
MFC after:	2 weeks
This commit is contained in:
Mark Johnston 2018-07-21 22:15:48 +00:00
parent d76b989004
commit 5aa9b11b61
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libproc/proc_sym.c
View File

@ -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);