From owner-svn-src-projects@FreeBSD.ORG  Mon Oct 19 15:25:53 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EED931065670;
	Mon, 19 Oct 2009 15:25:53 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE1F08FC12;
	Mon, 19 Oct 2009 15:25:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9JFPrAG005254;
	Mon, 19 Oct 2009 15:25:53 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9JFPr7R005252;
	Mon, 19 Oct 2009 15:25:53 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910191525.n9JFPr7R005252@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 19 Oct 2009 15:25:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198234 - projects/capabilities8/sys/amd64/amd64
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2009 15:25:54 -0000

Author: rwatson
Date: Mon Oct 19 15:25:53 2009
New Revision: 198234
URL: http://svn.freebsd.org/changeset/base/198234

Log:
  Merge Perforce c169596 into capabilities8 branch:
  
    amd64 also requires capability mode checks.
  
  Spotted by:	jonathan.anderson at cl.cam.ac.uk
  Sponsored by:	Google

Modified:
  projects/capabilities8/sys/amd64/amd64/trap.c

Modified: projects/capabilities8/sys/amd64/amd64/trap.c
==============================================================================
--- projects/capabilities8/sys/amd64/amd64/trap.c	Mon Oct 19 15:19:14 2009	(r198233)
+++ projects/capabilities8/sys/amd64/amd64/trap.c	Mon Oct 19 15:25:53 2009	(r198234)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
  * AMD64 Trap and System call handling
  */
 
+#include "opt_capabilities.h"
 #include "opt_clock.h"
 #include "opt_cpu.h"
 #include "opt_hwpmc_hooks.h"
@@ -68,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syscall.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
+#include <sys/ucred.h>
 #include <sys/uio.h>
 #include <sys/vmmeter.h>
 #ifdef KTRACE
@@ -961,6 +963,18 @@ syscall(struct trapframe *frame)
 
 	td->td_syscalls++;
 
+#ifdef CAPABILITIES
+	/*
+	 * In capabilities mode, we only allow access to system calls flagged
+	 * SYF_CAPENABLED.
+	 */
+	if (error == 0) {
+		if (!(callp->sy_flags & SYF_CAPENABLED) &&
+		    (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE))
+			error = ENOSYS;
+	}
+#endif
+
 	if (error == 0) {
 		td->td_retval[0] = 0;
 		td->td_retval[1] = frame->tf_rdx;