From owner-p4-projects@FreeBSD.ORG  Sun Jan 27 15:54:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5802116A420; Sun, 27 Jan 2008 15:54:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1DAD316A419
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 15:54:58 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C78713C455
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 15:54:58 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0RFsvWB000794
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 15:54:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RFsv3P000790
	for perforce@freebsd.org; Sun, 27 Jan 2008 15:54:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 27 Jan 2008 15:54:57 GMT
Message-Id: <200801271554.m0RFsv3P000790@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134203 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 27 Jan 2008 15:54:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=134203

Change 134203 by rwatson@rwatson_freebsd_capabilities on 2008/01/27 15:54:17

	In capabilities mode, don't allow the use of interpreters.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#5 (text+ko) ====

@@ -384,6 +384,18 @@
 
 interpret:
 	if (args->fname != NULL) {
+		/*
+		 * While capability mode can't reach this point via direct
+		 * path arguments to execve(), we also don't allow
+		 * interpreters to be used in capability mode (for now).
+		 * Catch indirect lookups and return a permissions error.
+		 *
+		 * XXXRW: Is this the right error?
+		 */
+		if (td->td_ucred->cr_flags & CRED_FLAG_CAPMODE) {
+			error = EPERM;
+			goto exec_fail;
+		}
 		error = namei(ndp);
 		if (error)
 			goto exec_fail;