From owner-p4-projects@FreeBSD.ORG  Sat Nov 10 00:32:28 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id F1DE0A78; Sat, 10 Nov 2012 00:32:27 +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 B22F699C
 for <perforce@freebsd.org>; Sat, 10 Nov 2012 00:32:27 +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 989218FC0A
 for <perforce@freebsd.org>; Sat, 10 Nov 2012 00:32:27 +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 qAA0WRnO026910
 for <perforce@freebsd.org>; Sat, 10 Nov 2012 00:32:27 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 qAA0WRZI026907
 for perforce@freebsd.org; Sat, 10 Nov 2012 00:32:27 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 10 Nov 2012 00:32:27 GMT
Message-Id: <201211100032.qAA0WRZI026907@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 219714 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: Sat, 10 Nov 2012 00:32:28 -0000

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

Change 219714 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/11/10 00:32:05

	Overload ECAPMODE instead of ENOSYS -- it seems a bit more
	suitable, and prevents confusion about system call
	non-implementation.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#8 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#8 (text+ko) ====

@@ -294,10 +294,10 @@
 
 	/*
 	 * Check whether userspace holds the rights defined in
-	 * cheri_capability_set_user() in $C0.  We might also consider
-	 * checking $PCC here.
+	 * cheri_capability_set_user() in $C0.  Note that object type is
+	 * We might also consider checking $PCC here.
 	 *
-	 * XXXRW: Possibly ENOSYS should be EPROT or ESANDBOX?
+	 * XXXRW: Possibly ECAPMODE should be EPROT or ESANDBOX?
 	 */
 	intr_disable();
 	CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC,
@@ -307,7 +307,7 @@
 	if (c.c_perms != CHERI_CAP_USER_PERMS ||
 	    c.c_base != CHERI_CAP_USER_BASE ||
 	    c.c_length != CHERI_CAP_USER_LENGTH)
-		return (ENOSYS);
+		return (ECAPMODE);
 	return (0);
 }