From owner-svn-src-all@FreeBSD.ORG  Fri Dec 27 22:14:04 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5ECF4571;
 Fri, 27 Dec 2013 22:14:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A6A613DD;
 Fri, 27 Dec 2013 22:14:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRME4tA047763;
 Fri, 27 Dec 2013 22:14:04 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRME4WS047762;
 Fri, 27 Dec 2013 22:14:04 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201312272214.rBRME4WS047762@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Fri, 27 Dec 2013 22:14:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r259964 - stable/9/lib/libproc
X-SVN-Group: stable-9
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.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 22:14:04 -0000

Author: markj
Date: Fri Dec 27 22:14:03 2013
New Revision: 259964
URL: http://svnweb.freebsd.org/changeset/base/259964

Log:
  MFC r257300:
  Fix an off-by-one error when checking whether a given address is within
  the extent of a symbol.

Modified:
  stable/9/lib/libproc/proc_sym.c
Directory Properties:
  stable/9/lib/libproc/   (props changed)

Modified: stable/9/lib/libproc/proc_sym.c
==============================================================================
--- stable/9/lib/libproc/proc_sym.c	Fri Dec 27 22:05:51 2013	(r259963)
+++ stable/9/lib/libproc/proc_sym.c	Fri Dec 27 22:14:03 2013	(r259964)
@@ -263,7 +263,7 @@ proc_addr2sym(struct proc_handle *p, uin
 		 * by rtld.
 		 */
 		rsym = map->pr_vaddr + sym.st_value;
-		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
+		if (addr >= rsym && addr < rsym + sym.st_size) {
 			s = elf_strptr(e, dynsymstridx, sym.st_name);
 			if (s) {
 				strlcpy(name, s, namesz);
@@ -299,7 +299,7 @@ proc_addr2sym(struct proc_handle *p, uin
 			rsym = map->pr_vaddr + sym.st_value;
 		else
 			rsym = sym.st_value;
-		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
+		if (addr >= rsym && addr < rsym + sym.st_size) {
 			s = elf_strptr(e, symtabstridx, sym.st_name);
 			if (s) {
 				strlcpy(name, s, namesz);