From owner-p4-projects@FreeBSD.ORG  Tue Nov 14 20:42:24 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9637216A756; Tue, 14 Nov 2006 20:42:24 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 734C116A753
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:42:24 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A195E43FA8
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:36:34 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAEKaYaN047286
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:36:34 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAEKaYPb047283
	for perforce@freebsd.org; Tue, 14 Nov 2006 20:36:34 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 14 Nov 2006 20:36:34 GMT
Message-Id: <200611142036.kAEKaYPb047283@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109980 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: Tue, 14 Nov 2006 20:42:24 -0000

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

Change 109980 by millert@millert_g5tower on 2006/11/14 20:35:34

	Split sebsd_file_check_ioctl into sebsd_file_check_ioctl() and
	sebsd_vnode_check_ioctl().

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#40 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#40 (text+ko) ====

@@ -3085,26 +3085,33 @@
 }
 #endif
 
+/*
+ * The file ioctl check are split into fd and vnode components.
+ */
 static int
 sebsd_file_check_ioctl(struct ucred *cred, struct fileglob *fg,
     struct label *fglabel, u_long com, void *data)
 {
 	struct task_security_struct *tsec;
 	struct file_security_struct *fsec;
-	int error;
 
 	tsec = SLOT(cred->cr_label);
 	fsec = SLOT(fglabel);
 
-	error = avc_has_perm(tsec->sid, fsec->sid, SECCLASS_FD,
-	    FD__USE, NULL);
-	if (error)
-		return (error);
-	if (fg->fg_type != DTYPE_VNODE)
-		return (0);
+	return (avc_has_perm(tsec->sid, fsec->sid, SECCLASS_FD, FD__USE, NULL));
+}
+
+static int
+sebsd_vnode_check_ioctl(struct ucred *cred, struct vnode *vp,
+    struct label *label, int com, caddr_t data)
+{
+	struct task_security_struct *tsec;
+	struct vnode_security_struct *vsec;
+
+	tsec = SLOT(cred->cr_label);
+	vsec = SLOT(label);
 
-	return (vnode_has_perm(cred, (struct vnode *)fg->fg_data,
-	    NULL, FILE__IOCTL));
+	return (vnode_has_perm(cred, vp, NULL, FILE__IOCTL));
 }
 
 /*
@@ -3709,6 +3716,7 @@
 //	.mpo_vnode_check_kqfilter = sebsd_vnode_check_kqfilter,
 	.mpo_vnode_check_link = sebsd_vnode_check_link,
 	.mpo_vnode_check_lookup = sebsd_vnode_check_lookup,
+	.mpo_vnode_check_ioctl = sebsd_vnode_check_ioctl,
 	.mpo_vnode_check_open = sebsd_vnode_check_open,
 	.mpo_vnode_check_read = sebsd_vnode_check_read,
 	.mpo_vnode_check_readdir = sebsd_vnode_check_readdir,