From owner-p4-projects@FreeBSD.ORG  Mon Apr 26 14:43:29 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 895AE10656DD; Mon, 26 Apr 2010 14:43:29 +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 31D9810656C0
	for <perforce@FreeBSD.org>; Mon, 26 Apr 2010 14:43:29 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FC828FC16
	for <perforce@FreeBSD.org>; Mon, 26 Apr 2010 14:43:29 +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 o3QEhTk1032875
	for <perforce@FreeBSD.org>; Mon, 26 Apr 2010 14:43:29 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3QEhSL3032873
	for perforce@freebsd.org; Mon, 26 Apr 2010 14:43:28 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 26 Apr 2010 14:43:28 GMT
Message-Id: <201004261443.o3QEhSL3032873@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 177354 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 26 Apr 2010 14:43:29 -0000

http://p4web.freebsd.org/@@177354?ac=10

Change 177354 by jona@jona-belle-freebsd8 on 2010/04/26 14:42:36

	Allow objects to be loaded by FD number instead of name

Affected files ...

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

Differences ...

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

@@ -1703,17 +1703,22 @@
 	    return obj;
 
 #ifdef IN_RTLD_CAP
-    if (strchr(name, '/') != NULL) {
-	_rtld_error("Absolute paths to shared objects not supported \"%s\"", name);
-	return NULL;
-    }
+    path = xstrdup(name);
 
     /* is the name actually a file descriptor? */
-    long long long_fd = strtonum(name, 0, 10000, NULL);
-    fd = (int) long_fd;
-    if (fstat(fd, &sb) == -1) {
-    	/* if not, search the library path */
-	path = xstrdup(name);
+    long long long_fd = strtonum(path, 0, __INT_MAX, NULL);
+    if ((long_fd >= 0) && (fstat((int) long_fd, &sb) == 0))
+	fd = (int) long_fd;
+
+    /* if not, search the library path */
+    else {
+	dbg("preload by name: %s", name);
+	if (strchr(name, '/') != NULL) {
+	    _rtld_error("Absolute paths (e.g. \"%s\") not supported", path);
+	    free(path);
+	    return NULL;
+	}
+
 	if ((fd = find_library_fd(path)) < 0) {
 	    _rtld_error("Unable to find \"%s\" in LD_LIBRARY_DIRS", path);
 	    free(path);
@@ -1791,7 +1796,7 @@
     if (dangerous_ld_env) {
 	if (fstatfs(fd, &fs) != 0) {
 	    _rtld_error("Cannot fstatfs \"%s\"", path);
-		return NULL;
+	    return NULL;
 	}
 	if (fs.f_flags & MNT_NOEXEC) {
 	    _rtld_error("Cannot execute objects on %s\n", fs.f_mntonname);