From owner-p4-projects@FreeBSD.ORG  Wed Jul  6 15:34:54 2005
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 DDA4316A41F; Wed,  6 Jul 2005 15:34:53 +0000 (GMT)
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 A6D0816A41C
	for <perforce@freebsd.org>; Wed,  6 Jul 2005 15:34:53 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7E5AC43D46
	for <perforce@freebsd.org>; Wed,  6 Jul 2005 15:34:53 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j66FYreT017899
	for <perforce@freebsd.org>; Wed, 6 Jul 2005 15:34:53 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j66FYrma017896
	for perforce@freebsd.org; Wed, 6 Jul 2005 15:34:53 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 6 Jul 2005 15:34:53 GMT
Message-Id: <200507061534.j66FYrma017896@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 79656 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: Wed, 06 Jul 2005 15:34:54 -0000

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

Change 79656 by rwatson@rwatson_zoo on 2005/07/06 15:34:52

	Prototype code to accept a mount label from nmount().  #if'd 0.
	
	Also correct a syntax error.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#18 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#18 (text+ko) ====

@@ -470,7 +470,14 @@
 	struct vfsoptlist *optlist;
 	char *fstype, *fspath;
 	int error, fstypelen, fspathlen;
+#if 0
+	char *labelstr;
+	int labelstrlen;
+#endif
+	struct label *label;
 
+	label = NULL;
+
 	error = vfs_buildopts(fsoptions, &optlist);
 	if (error)
 		return (error);
@@ -503,10 +510,36 @@
 		goto bail;
 	}
 
+#if 0
+	/*
+	 * XXXMAC: In __mac_execve(), we have entry and exit entry points so
+	 * that less of the label frobbing is visible in the calling code.
+	 * We might want to think about doing that here also.
+	 */
+	labelstrlen = 0;
+	error = vfs_getopt(optlist, "label", (void **)&labelstr,
+	    &labelstrlen);
+	if (error != ENOENT) {
+		if (error || labelstr[labelstrlen - 1] != '\0') {
+			error = EINVAL;
+			goto bail;
+		}
+
+		label = mac_mount_label_alloc();
+		error = mac_internalize_mount_label(label, labelstr);
+		if (error)
+			goto bail;
+	}
+#endif
+
 	mtx_lock(&Giant);
-	error = vfs_domount(td, fstype, fspath, fsflags, optlist, NULL);
+	error = vfs_domount(td, fstype, fspath, fsflags, optlist, label);
 	mtx_unlock(&Giant);
 bail:
+#if 0
+	if (label != NULL)
+		mac_mount_label_free(label);
+#endif
 	if (error)
 		vfs_freeopts(optlist);
 	return (error);
@@ -581,7 +614,7 @@
 	char *fspath,		/* Mount path. */
 	int fsflags,		/* Flags common to all filesystems. */
 	void *fsdata,		/* Options local to the filesystem. */
-	struct label *mntlabel, /* MAC label */
+	struct label *mntlabel	/* MAC label */
 	)
 {
 	struct vnode *vp;