From owner-p4-projects@FreeBSD.ORG  Thu Nov 15 06:39:02 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 97B561F1; Thu, 15 Nov 2012 06:39:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 50BC21EF
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 06:39:02 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 372EC8FC12
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 06:39:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAF6d2Un043296
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 06:39:02 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAF6d1AH043293
 for perforce@freebsd.org; Thu, 15 Nov 2012 06:39:01 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 15 Nov 2012 06:39:01 GMT
Message-Id: <201211150639.qAF6d1AH043293@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219792 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 15 Nov 2012 06:39:02 -0000

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

Change 219792 by brooks@brooks_zenith on 2012/11/15 06:38:08

	Rather than reading in the png file only to stuff it in a
	buffer, just mmap it in the CHERI case.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#6 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#6 (text+ko) ====

@@ -225,7 +225,7 @@
 static struct chericap c1, c2;
 
 static struct iboxstate*
-cheri_png_read_start(const char *pngbuffer, size_t pnglen,
+cheri_png_read_start(char *pngbuffer, size_t pnglen,
     uint32_t width, uint32_t height, int slide, enum sbtype sb)
 {
 	struct sandbox			*sandbox;
@@ -273,6 +273,7 @@
 	is->passes_remaining = 0;
 	return (is);
 error:
+	munmap(pngbuffer, pnglen);
 	if (is != NULL) {
 		free(__DEVOLATILE(void *, is->buffer));
 		free(is);
@@ -289,7 +290,6 @@
 png_read_start(int pfd, uint32_t maxw, uint32_t maxh, int slide, enum sbtype sb)
 {
 	size_t pnglen;
-	ssize_t rlen;
 	uint32_t header[9], width, height;
 	struct stat statbuf;
 	char *cheader = (char *)header;
@@ -332,24 +332,12 @@
 			close(pfd);
 			return (NULL);
 		}
-		/* XXX bogus limit */
-		if (statbuf.st_size > 1024 * 1024) {
-			close(pfd);
-			return (NULL);
-		}
-		if ((pngbuffer = malloc(statbuf.st_size)) == NULL) {
+		pnglen = statbuf.st_size;
+		if ((pngbuffer = mmap(NULL, pnglen, PROT_READ,
+		    0, pfd, 0)) == NULL) {
 			close(pfd);
 			return (NULL);
 		}
-		pnglen = 0;
-		while (pnglen < (size_t) statbuf.st_size) {
-			if ((rlen = read(pfd, pngbuffer + pnglen,
-			    statbuf.st_size - pnglen)) == -1) {
-				close(pfd);
-				return (NULL);
-			}
-			pnglen += rlen;
-		}
 		close(pfd);
 		return cheri_png_read_start(pngbuffer, pnglen, width, height,
 		   slide, sb);