From owner-p4-projects@FreeBSD.ORG Sat Jan 30 11:20:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A598B1065695; Sat, 30 Jan 2010 11:20:20 +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 68D7F1065670 for ; Sat, 30 Jan 2010 11:20:20 +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 557F78FC18 for ; Sat, 30 Jan 2010 11:20:20 +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 o0UBKK1D033936 for ; Sat, 30 Jan 2010 11:20:20 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 o0UBKKpu033934 for perforce@freebsd.org; Sat, 30 Jan 2010 11:20:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 11:20:20 GMT Message-Id: <201001301120.o0UBKKpu033934@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 To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 11:20:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=173944 Change 173944 by rwatson@rwatson_vimage_client on 2010/01/30 11:20:14 Only set up a file descriptor list (and its corresponding POSIX shared memory segment + environmental variable) if we're going to use it. Update copyright year. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Robert N. M. Watson + * Copyright (c) 2009-2010 Robert N. M. Watson * All rights reserved. * * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#5 $ */ #include @@ -152,31 +152,35 @@ { int *fd_array, fdcount; struct sbuf *sbufp; - int shmfd, fdlistsize; + int shmfd = -1; + size_t fdlistsize; void *shm; char fdliststr[8]; u_int i; + /* + * Create an anonymous shared memory segment for the FD list. + */ + if (fds != NULL) { + shmfd = shm_open(SHM_ANON, O_RDWR, 0600); + if (shmfd < 0) + return; + fdlistsize = lc_fdlist_size(fds); + if (ftruncate(shmfd, fdlistsize) < 0) + return; - /* create an anonymous shared memory segment for the FD list */ - shmfd = shm_open(SHM_ANON, O_RDWR, 0600); - if (shmfd < 0) return; - - fdlistsize = lc_fdlist_size(fds); - if (ftruncate(shmfd, fdlistsize) < 0) return; + /* + * Map it and copy the list. + */ + shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, + MAP_NOSYNC | MAP_SHARED, shmfd, 0); + if (shm == MAP_FAILED) + return; + memcpy(shm, fds, fdlistsize); + if (munmap(shm, fdlistsize)) + return; + } - - /* map it and copy the list */ - shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, - MAP_NOSYNC | MAP_SHARED, shmfd, 0); - - if (shm == MAP_FAILED) return; - memcpy(shm, fds, fdlistsize); - - if (munmap(shm, fdlistsize)) return; - - - if (lc_limitfd(fd_devnull, LIBCAPABILITY_CAPMASK_DEVNULL) < 0) return; if (lc_limitfd(fd_sandbox, LIBCAPABILITY_CAPMASK_SANDBOX) < 0) @@ -254,9 +258,11 @@ return; sbuf_delete(sbufp); - sprintf(fdliststr, "%d", 10); - if (setenv(LIBCAPABILITY_SANDBOX_FDLIST, fdliststr, 1) == -1) - return; + if (fds != NULL) { + sprintf(fdliststr, "%d", 10); + if (setenv(LIBCAPABILITY_SANDBOX_FDLIST, fdliststr, 1) == -1) + return; + } if (cap_enter() < 0) return;