From owner-p4-projects@FreeBSD.ORG  Sun Sep 29 14:06:47 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 3DB96FB3; Sun, 29 Sep 2013 14:06:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F3BA5FB1
 for <perforce@freebsd.org>; Sun, 29 Sep 2013 14:06:46 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFA642868
 for <perforce@freebsd.org>; Sun, 29 Sep 2013 14:06:46 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r8TE6kkW023728
 for <perforce@freebsd.org>; Sun, 29 Sep 2013 14:06:46 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r8TE6ka2023725
 for perforce@freebsd.org; Sun, 29 Sep 2013 14:06:46 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 29 Sep 2013 14:06:46 GMT
Message-Id: <201309291406.r8TE6ka2023725@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 893249 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: Sun, 29 Sep 2013 14:06:47 -0000

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

Change 893249 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/29 14:06:40

	Add an additional NULL-pointer derefence command to cheritest,
	since we appear to have an issue with kernel stack corruption
	visible only in the handler for invalid TLB entries, triggered
	by excessively imaginative pointer dereferences.

Affected files ...

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

Differences ...

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

@@ -74,6 +74,7 @@
 	fprintf(stderr, "cheritest listcausereg\n");
 	fprintf(stderr, "cheritest listprivregs\n");
 	fprintf(stderr, "cheritest listregs\n");
+	fprintf(stderr, "cheritest nullderef\n");
 	fprintf(stderr, "cheritest overrun\n");
 	fprintf(stderr, "cheritest sandbox\n");
 	fprintf(stderr, "cheritest sandbox_invoke_abort\n");
@@ -221,6 +222,16 @@
 }
 
 static void
+cheritest_nullderef(void)
+{
+	int *p, v;
+
+	p = NULL;
+	v = *p;
+	printf("%d\n", v);
+}
+
+static void
 cheritest_sandbox(void)
 {
 
@@ -340,6 +351,8 @@
 			cheritest_copyregs();
 		else if (strcmp(argv[i], "creturn") == 0)
 			cheritest_creturn();
+		else if (strcmp(argv[i], "nullderef") == 0)
+			cheritest_nullderef();
 		else if (strcmp(argv[i], "overrun") == 0)
 			cheritest_overrun();
 		else if (strcmp(argv[i], "sandbox") == 0)