From owner-p4-projects@FreeBSD.ORG  Mon Nov 12 08:10:49 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 9E88582A; Mon, 12 Nov 2012 08:10:49 +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 3A83A828
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 08:10:49 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 02A068FC0C
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 08:10:49 +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 qAC8Amvm055181
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 08:10:48 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAC8AmsB055178
 for perforce@freebsd.org; Mon, 12 Nov 2012 08:10:48 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Nov 2012 08:10:48 GMT
Message-Id: <201211120810.qAC8AmsB055178@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 219759 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: Mon, 12 Nov 2012 08:10:50 -0000

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

Change 219759 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2012/11/12 08:10:03

	Clean up error handling and output in cheritest sandbox_invoke.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/sandbox.c#2 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/sandbox.c#2 (text+ko) ====

@@ -55,7 +55,7 @@
 		    register_t);
 
 struct sandbox {
-	const char	*sb_path;
+	char		*sb_path;
 	void		*sb_mem;
 	register_t	 sb_sandboxlen;
 	struct chericap	 sb_segment;
@@ -77,31 +77,30 @@
 		return (-1);
 	}
 
-	sb = malloc(sizeof(*sb));
+	sb = calloc(1, sizeof(*sb));
 	if (sb == NULL) {
 		saved_errno = errno;
 		warn("%s: malloc", __func__);
-		close(fd);
-		errno = saved_errno;
-		return (-1);
+		goto error;
+	}
+	sb->sb_path = strdup(path);
+	if (sb->sb_path == NULL) {
+		saved_errno = errno;
+		warn("%s: fstat %s", __func__, path);
+		goto error;
 	}
 
 	if (fstat(fd, &sb->sb_stat) < 0) {
 		saved_errno = errno;
 		warn("%s: fstat %s", __func__, path);
-		free(sb);
-		close(fd);
-		errno = saved_errno;
-		return (-1);
+		goto error;
 	}
 
 	/* For now, support only "small" sandboxed programs. */
 	if (sb->sb_stat.st_size >= sandboxlen/2) {
+		saved_errno = EINVAL;
 		warnx("%s: %s too large", __func__, path);
-		free(sb);
-		close(fd);
-		errno = EINVAL;
-		return (-1);
+		goto error;
 	}
 
 	/*
@@ -111,10 +110,7 @@
 	if (sb->sb_mem == MAP_FAILED) {
 		saved_errno = errno;
 		warn("%s: mmap region", __func__);
-		free(sb);
-		close(fd);
-		errno = saved_errno;
-		return (-1);
+		goto error;
 	}
 
 	if (mmap((uint8_t *)sb->sb_mem + 0x1000, sb->sb_stat.st_size,
@@ -122,13 +118,10 @@
 	    MAP_FAILED) {
 		saved_errno = errno;
 		warn("%s: mmap %s", __func__, path);
-		munmap(sb->sb_mem, sandboxlen);
-		free(sb);
-		close(fd);
-		errno = saved_errno;
-		return (-1);
+		goto error;
 	}
 	close(fd);
+	fd = -1;
 
 	if (mmap((uint8_t *)sb->sb_mem + 0x1000 +
 	    roundup2(sb->sb_stat.st_size, 4096),
@@ -137,10 +130,7 @@
 	    MAP_FAILED) {
 		saved_errno = errno;
 		warn("%s: mmap heap/stack", __func__);
-		munmap(sb->sb_mem, sandboxlen);
-		free(sb);
-		errno = saved_errno;
-		return (-1);
+		goto error;
 	}
 
 	/*
@@ -167,12 +157,25 @@
 	CHERI_CGETTYPE(v, 10);
 	printf(" otype %p\n", (void *)v);
 	CHERI_CGETBASE(v, 10);
-	printf("    base %p\n", (void *)v);
+	printf("    base %p", (void *)v);
 	CHERI_CGETLEN(v, 10);
 	printf(" length %p\n", (void *)v);
 
 	*sbp = sb;
 	return (0);
+
+error:
+	if (sb != NULL) {
+		if (sb->sb_path != NULL)
+			free(sb->sb_path);
+		if (sb->sb_mem != NULL)
+			munmap(sb->sb_mem, sandboxlen);
+		free(sb);
+	}
+	if (fd != -1)
+		close(fd);
+	errno = saved_errno;
+	return (-1);
 }
 
 register_t