From owner-p4-projects@FreeBSD.ORG Fri Jan 29 19:15:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3C32106572D; Fri, 29 Jan 2010 19:15:13 +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 D9335106568F for ; Fri, 29 Jan 2010 19:15:12 +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 BDBC68FC1A for ; Fri, 29 Jan 2010 19:15:12 +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 o0TJFCdG091341 for ; Fri, 29 Jan 2010 19:15:12 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0TJFClT091339 for perforce@freebsd.org; Fri, 29 Jan 2010 19:15:12 GMT (envelope-from jona@FreeBSD.org) Date: Fri, 29 Jan 2010 19:15:12 GMT Message-Id: <201001291915.o0TJFClT091339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173919 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: Fri, 29 Jan 2010 19:15:14 -0000 http://p4web.freebsd.org/chv.cgi?CH=173919 Change 173919 by jona@jona-capsicum-kent64 on 2010/01/29 19:14:24 Enable libcapsicum_fdlist stuff, since the mmap panic is gone Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#4 (text+ko) ==== @@ -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_fdlist.c#3 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#4 $ */ #include @@ -42,6 +42,7 @@ #include #include #include +#include #include "libcapsicum_sandbox_api.h" @@ -96,7 +97,6 @@ if (global_fdlist == NULL) { char *env = getenv(LIBCAPABILITY_SANDBOX_FDLIST); - printf("%s: %s\n", LIBCAPABILITY_SANDBOX_FDLIST, env); if ((env != NULL) && (strnlen(env, 8) < 7)) { @@ -111,20 +111,13 @@ if (fd < 0) return NULL; - printf("testing FD %i...", fd); fflush(stdout); struct stat stats; if (fstat(fd, &stats) < 0) return NULL; - printf(" done. Size: %lu\n", stats.st_size); - - printf("mapping FD %i... ", fd); fflush(stdout); - /* global_fdlist = mmap(NULL, stats.st_size, PROT_READ | PROT_WRITE, - MAP_NOSYNC | MAP_PRIVATE, fd, 0); - */ - printf(" done.\n"); + MAP_NOSYNC | MAP_SHARED, fd, 0); } } @@ -166,9 +159,12 @@ LOCK(orig); int size = lc_fdlist_size(orig); + struct lc_fdlist *copy = NULL; - struct lc_fdlist *copy = malloc(size); - if (copy == NULL) return (NULL); + if (size > 0) { + copy = malloc(size); + if (copy != NULL) memcpy(copy, orig, size); + } UNLOCK(orig); ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 (text+ko) ==== @@ -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#3 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 $ */ #include @@ -153,7 +153,7 @@ int *fd_array, fdcount; struct sbuf *sbufp; int shmfd, fdlistsize; - /*void *shm;*/ + void *shm; char fdliststr[8]; u_int i; @@ -166,11 +166,7 @@ if (ftruncate(shmfd, fdlistsize) < 0) return; - printf("%dB of memory to mmap\n", fdlistsize); - - /* map it and copy the list */ - /* shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, MAP_NOSYNC | MAP_SHARED, shmfd, 0); @@ -178,8 +174,6 @@ memcpy(shm, fds, fdlistsize); if (munmap(shm, fdlistsize)) return; - */ -