From owner-p4-projects@FreeBSD.ORG  Wed Sep 21 10:31:33 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 41A1E16A421; Wed, 21 Sep 2005 10:31:33 +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 1826116A41F
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 10:31:33 +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 D976943D4C
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 10:31:32 +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 j8LAVWYN039560
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 10:31:32 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 j8LAVWst039557
	for perforce@freebsd.org; Wed, 21 Sep 2005 10:31:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 21 Sep 2005 10:31:32 GMT
Message-Id: <200509211031.j8LAVWst039557@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 84038 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, 21 Sep 2005 10:31:34 -0000

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

Change 84038 by rwatson@rwatson_zoo on 2005/09/21 10:31:16

	Don't unconditionally assert Giant when auditing a path -- rely on
	the caller to acquire Giant if needed, and assert based on need.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#30 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#30 (text+ko) ====

@@ -2359,9 +2359,10 @@
 		return;
 
 	/*
-	 * XXXAUDIT: Less Giant needed here.
+	 * Assume that if the caller is calling audit_arg_vnpath() on a
+	 * non-MPSAFE vnode, then it will have acquired Giant.
 	 */
-	mtx_assert(&Giant, MA_OWNED);
+	VFS_ASSERT_GIANT(vp->v_mount);
 	ASSERT_VOP_LOCKED(vp, "audit_arg_vnpath");
 
 	ar = currecord();