From owner-svn-src-all@freebsd.org Sat Jul 21 22:15:49 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21A97102E395; Sat, 21 Jul 2018 22:15:49 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BA1D47A2C0; Sat, 21 Jul 2018 22:15:48 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D30C24EEB; Sat, 21 Jul 2018 22:15:48 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6LMFm9T080538; Sat, 21 Jul 2018 22:15:48 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6LMFmee080537; Sat, 21 Jul 2018 22:15:48 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201807212215.w6LMFmee080537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sat, 21 Jul 2018 22:15:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336592 - head/lib/libproc X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/lib/libproc X-SVN-Commit-Revision: 336592 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jul 2018 22:15:49 -0000 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);