From owner-p4-projects@FreeBSD.ORG  Thu Jul 23 05:12:14 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C04C106567D; Thu, 23 Jul 2009 05:12:14 +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 EFC21106567A
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 05:12:13 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DE5588FC25
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 05:12:13 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6N5CDRH062651
	for <perforce@FreeBSD.org>; Thu, 23 Jul 2009 05:12:13 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6N5CDZP062649
	for perforce@freebsd.org; Thu, 23 Jul 2009 05:12:13 GMT
	(envelope-from jona@FreeBSD.org)
Date: Thu, 23 Jul 2009 05:12:13 GMT
Message-Id: <200907230512.n6N5CDZP062649@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166428 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: Thu, 23 Jul 2009 05:12:15 -0000

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

Change 166428 by jona@jona-trustedbsd-belle-vmware on 2009/07/23 05:11:18

	Let fo_ioctl() unwrap capabilities if required

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#13 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#13 (text+ko) ====

@@ -44,6 +44,10 @@
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 
+#ifdef CAPABILITIES
+#include <sys/capability.h>
+#endif /* CAPABILITIES */
+
 struct stat;
 struct thread;
 struct uio;
@@ -272,8 +276,20 @@
 	struct ucred *active_cred;
 	struct thread *td;
 {
+	struct file *p = fp;
+
+#ifdef CAPABILITIES
+	int error;
+
+	if (fp->f_type == DTYPE_CAPABILITY)
+	{
+		error = cap_fextract(fp, CAP_IOCTL, &p);
+		if (error)
+			return error;
+	}
+#endif /* CAPABILITIES */
 
-	return ((*fp->f_ops->fo_ioctl)(fp, com, data, active_cred, td));
+	return ((*p->f_ops->fo_ioctl)(p, com, data, active_cred, td));
 }
 
 static __inline int