From owner-p4-projects@FreeBSD.ORG  Fri Aug 21 22:45:45 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C0A95106568E; Fri, 21 Aug 2009 22:45:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8568B106568B
	for <perforce@freebsd.org>; Fri, 21 Aug 2009 22:45:45 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 74C4A8FC0A
	for <perforce@freebsd.org>; Fri, 21 Aug 2009 22:45:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7LMjjsT004056
	for <perforce@freebsd.org>; Fri, 21 Aug 2009 22:45:45 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7LMjjIk004054
	for perforce@freebsd.org; Fri, 21 Aug 2009 22:45:45 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 21 Aug 2009 22:45:45 GMT
Message-Id: <200908212245.n7LMjjIk004054@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167590 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Aug 2009 22:45:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=167590

Change 167590 by stas@stas_orion on 2009/08/21 22:45:26

	- FreeBSD may copy the last file page to the following section,
	  so the size of mapping will be smaller than filesiz.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#8 (text+ko) ====

@@ -1262,7 +1262,8 @@
             else if (rw_svma_limit == 0
                      && phdr->p_offset >= di->rw_map_foff
                      && phdr->p_offset < di->rw_map_foff + di->rw_map_size
-                     && phdr->p_offset + phdr->p_filesz <= di->rw_map_foff + di->rw_map_size) {
+                     && phdr->p_offset + (phdr->p_filesz & ~(VKI_PAGE_SIZE - 1))
+                     <= di->rw_map_foff + di->rw_map_size) {
                rw_svma_base = phdr->p_vaddr;
                rw_svma_limit = phdr->p_vaddr + phdr->p_memsz;
                rw_bias = di->rw_map_avma - di->rw_map_foff + phdr->p_offset - phdr->p_vaddr;