From owner-p4-projects@FreeBSD.ORG  Sun Jan 25 00:07:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 51B371065677; Sun, 25 Jan 2009 00:07:39 +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 0E4AC106564A
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:07:39 +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 EE5C08FC12
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:07:38 +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 n0P07ccI002092
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:07:38 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 n0P07cQS002090
	for perforce@freebsd.org; Sun, 25 Jan 2009 00:07:38 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 25 Jan 2009 00:07:38 GMT
Message-Id: <200901250007.n0P07cQS002090@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 156628 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:07:40 -0000

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

Change 156628 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 00:06:47

	When no ELF interpret is loaded, set AT_BASE to NULL rather than
	setting it to the address we would have used if there had been
	an interpreter.  One might argue that AT_BASE shouldn't be set in
	this case, but Linux does so, so do it here as well.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#5 (text+ko) ====

@@ -827,7 +827,8 @@
 			uprintf("ELF interpreter %s not found\n", interp);
 			return (error);
 		}
-	}
+	} else
+		addr = 0;
 
 	/*
 	 * Construct auxargs table (used by the fixup routine)