From owner-svn-src-projects@FreeBSD.ORG  Thu Oct  8 21:53:58 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE1F51065672;
	Thu,  8 Oct 2009 21:53:58 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDDDF8FC0A;
	Thu,  8 Oct 2009 21:53:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n98Lrwxl034576;
	Thu, 8 Oct 2009 21:53:58 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n98Lrwxs034574;
	Thu, 8 Oct 2009 21:53:58 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910082153.n98Lrwxs034574@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 8 Oct 2009 21:53:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197880 - projects/capabilities8/libexec/rtld-elf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 21:53:58 -0000

Author: rwatson
Date: Thu Oct  8 21:53:58 2009
New Revision: 197880
URL: http://svn.freebsd.org/changeset/base/197880

Log:
  Manually merge r197808 from head to capabilities8:
  
    In rtld's map_object(), use pread(..., 0) rather than read() to read the
    ELF header from the front of the file.  As all other I/O on the binary
    is done using mmap(), this avoids the need for seek privileges on the
    file descriptor during run-time linking.
  
    Sponsored by:   Google

Modified:
  projects/capabilities8/libexec/rtld-elf/map_object.c

Modified: projects/capabilities8/libexec/rtld-elf/map_object.c
==============================================================================
--- projects/capabilities8/libexec/rtld-elf/map_object.c	Thu Oct  8 21:52:13 2009	(r197879)
+++ projects/capabilities8/libexec/rtld-elf/map_object.c	Thu Oct  8 21:53:58 2009	(r197880)
@@ -273,7 +273,7 @@ get_elf_header (int fd, const char *path
     } u;
     ssize_t nbytes;
 
-    if ((nbytes = read(fd, u.buf, PAGE_SIZE)) == -1) {
+    if ((nbytes = pread(fd, u.buf, PAGE_SIZE, 0)) == -1) {
 	_rtld_error("%s: read error: %s", path, strerror(errno));
 	return NULL;
     }