From owner-p4-projects@FreeBSD.ORG  Thu Jan 15 08:27:21 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3EBAD16A4D0; Thu, 15 Jan 2004 08:27:21 -0800 (PST)
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 1AE1D16A4CE
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:27:21 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7608C43D49
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:27:19 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FGRJ0B099455
	for <perforce@freebsd.org>; Thu, 15 Jan 2004 08:27:19 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FGRJNa099452
	for perforce@freebsd.org; Thu, 15 Jan 2004 08:27:19 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 15 Jan 2004 08:27:19 -0800 (PST)
Message-Id: <200401151627.i0FGRJNa099452@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>
Subject: PERFORCE change 45391 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 15 Jan 2004 16:27:21 -0000

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

Change 45391 by rwatson@rwatson_tislabs on 2004/01/15 08:26:17

	Assert Giant for VFS.
	Lock fdp while accessing it to find current/root directories.
	Vref the vnodes before releasing the file descriptor lock.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#9 (text+ko) ====

@@ -729,11 +729,11 @@
 	struct vnode *vnp;
 	struct filedesc *fdp;
 
-	/*
-	 * XXX: file descriptor locking!
-	 */
+	mtx_assert(&Giant, MA_OWNED);
+
 	fdp = td->td_proc->p_fd;
 	bufp = path;
+	FILEDESC_LOCK(fdp);
 	if (*(path) == '/') {
 		while (*(bufp) == '/') 
 			bufp++;			/* skip leading '/'s	     */
@@ -746,11 +746,14 @@
 			bufp--;			/* restore one '/'	     */
 		} else {
 			vnp = fdp->fd_rdir;	/* use process root	     */
+			vref(vnp);
 		}
 	} else {
 		vnp = fdp->fd_cdir;	/* prepend the current dir  */
+		vref(vnp);
 		bufp = path;
 	}
+	FILEDESC_UNLOCK(fdp);
 	if (vnp != NULL) {
 		/*
 		 * XXX: Should lock vnode!
@@ -765,7 +768,7 @@
 		vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY, td);
 		if (vn_fullpath(NULL, vnp, cpath, MAXPATHLEN) != 0)
 			cpath[0] = '\0';
-		VOP_UNLOCK(vnp, 0, td);
+		vput(vnp);
 		len = strlen(cpath);
 		strncpy(cpath + len-1, bufp, MAXPATHLEN - len);
 	} else {