From owner-p4-projects@FreeBSD.ORG  Thu Nov 15 18:23:10 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 7AF82AD5; Thu, 15 Nov 2012 18:23:10 +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 2E10AAD3
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 18:23:10 +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 12E638FC13
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 18:23:10 +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 qAFIN9Hm069865
 for <perforce@freebsd.org>; Thu, 15 Nov 2012 18:23:09 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAFIN9J9069862
 for perforce@freebsd.org; Thu, 15 Nov 2012 18:23:09 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 15 Nov 2012 18:23:09 GMT
Message-Id: <201211151823.qAFIN9J9069862@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 219798 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 18:23:10 -0000

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

Change 219798 by brooks@brooks_zenith on 2012/11/15 18:22:46

	Only read cover slides for the cheripoint image.
	Invoke cheripoint with -f so it can handle exploits in the
	unsandboxed mode.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/pictview.c#7 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/pictview.c#7 (text+ko) ====

@@ -41,6 +41,7 @@
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <fnmatch.h>
 #include <libutil.h>
 #include <poll.h>
 #include <signal.h>
@@ -428,6 +429,9 @@
       /* XXX: doesn't support symlinks */
       if (entry->d_type != DT_REG)
 	continue;
+      /* Ignore all files other than covers. */
+      if (fnmatch("*-cover-*.png", entry->d_name, 0) != 0)
+	continue;
       if (slide_nimages == maxslides) {
         maxslides *= 2;
         slidenames = realloc(slidenames, sizeof(*slidenames) * maxslides);
@@ -790,7 +794,7 @@
       syslog(LOG_ALERT, "login_tty failed in child: %s", strerror(errno));
       err(1, "tty_login");
     }
-    execl("/usr/bin/cheripoint", "cheripoint", slide_dir, NULL);
+    execl("/usr/bin/cheripoint", "cheripoint", "-f", slide_dir, NULL);
     syslog(LOG_ALERT, "exec of /usr/bin/cheripoint failed: %s", strerror(errno));
     err(1, "execl()");
   }