From owner-p4-projects@FreeBSD.ORG  Sun Jan 25 00:50:22 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AE47E1065673; Sun, 25 Jan 2009 00:50:22 +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 6BB51106566C
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:50:22 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 582D68FC14
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:50:22 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0P0oMxT019364
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:50:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0P0oMnj019362
	for perforce@freebsd.org; Sun, 25 Jan 2009 00:50:22 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 25 Jan 2009 00:50:22 GMT
Message-Id: <200901250050.n0P0oMnj019362@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156629 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: Sun, 25 Jan 2009 00:50:23 -0000

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

Change 156629 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 00:49:32

	When mapping an object that requires a specific virtual address,
	use MAP_FIXED in case an earlier object has already been mapped
	at a fixed address and disturbs mmap's heuristics for placing
	objects automatically.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#2 (text+ko) ====

@@ -83,6 +83,7 @@
     Elf_Addr bss_vaddr;
     Elf_Addr bss_vlimit;
     caddr_t bss_addr;
+    int mmap_flags;
 
     hdr = get_elf_header(fd, path);
     if (hdr == NULL)
@@ -153,8 +154,11 @@
     mapsize = base_vlimit - base_vaddr;
     base_addr = hdr->e_type == ET_EXEC ? (caddr_t) base_vaddr : NULL;
 
+    mmap_flags = convert_flags(segs[0]->p_flags);
+    if (base_addr != NULL)
+	mmap_flags |= MAP_FIXED;
     mapbase = mmap(base_addr, mapsize, convert_prot(segs[0]->p_flags),
-      convert_flags(segs[0]->p_flags), fd, base_offset);
+      mmap_flags, fd, base_offset);
     if (mapbase == (caddr_t) -1) {
 	_rtld_error("%s: mmap of entire address space failed: %s",
 	  path, strerror(errno));