Date: Sat, 21 Jul 2018 22:15:48 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336592 - head/lib/libproc Message-ID: <201807212215.w6LMFmee080537@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Sat Jul 21 22:15:48 2018 New Revision: 336592 URL: https://svnweb.freebsd.org/changeset/base/336592 Log: Take the mapping's segment offset into account when resolving symbols. Reported by: Jenkins, via asomers MFC after: 2 weeks Modified: head/lib/libproc/proc_sym.c Modified: head/lib/libproc/proc_sym.c ============================================================================== --- head/lib/libproc/proc_sym.c Sat Jul 21 22:10:28 2018 (r336591) +++ head/lib/libproc/proc_sym.c Sat Jul 21 22:15:48 2018 (r336592) @@ -520,7 +520,8 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, c } 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 *objec } 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807212215.w6LMFmee080537>