From owner-p4-projects@FreeBSD.ORG  Wed Feb 23 22:35:37 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49D3E1065672; Wed, 23 Feb 2011 22:35:37 +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 0A59C106566B
	for <perforce@FreeBSD.org>; Wed, 23 Feb 2011 22:35:37 +0000 (UTC)
	(envelope-from gpf@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id EB85E8FC14
	for <perforce@FreeBSD.org>; Wed, 23 Feb 2011 22:35:36 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p1NMZaVb017641
	for <perforce@FreeBSD.org>; Wed, 23 Feb 2011 22:35:36 GMT
	(envelope-from gpf@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p1NMZaev017638
	for perforce@freebsd.org; Wed, 23 Feb 2011 22:35:36 GMT
	(envelope-from gpf@FreeBSD.org)
Date: Wed, 23 Feb 2011 22:35:36 GMT
Message-Id: <201102232235.p1NMZaev017638@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gpf@FreeBSD.org using -f
From: Efstratios Karatzas <gpf@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 189073 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 23 Feb 2011 22:35:37 -0000

http://p4web.freebsd.org/@@189073?ac=10

Change 189073 by gpf@gpf_desktop on 2011/02/23 22:34:46

	- call to nfsrv_auditpath() should be after possible unlocking of 'nvp'

Affected files ...

.. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#16 edit

Differences ...

==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/fs/nfsserver/nfs_nfsdsocket.c#16 (text+ko) ====

@@ -915,12 +915,7 @@
 				vn_start_write(vp, &temp_mp, V_WAIT);
 			nvp = NULL;
 			error = (*(nfsrv4_ops1[op]))(nd, isdgram, vp,
-			    &nvp, (fhandle_t *)fh.nfsrvfh_data, p, &vpnes);
-			if (nvp != NULL) {
-				nfsrv_auditpath(nvp, NULL, NULL, 
-					(fhandle_t *)fh.nfsrvfh_data, 1);
-				vrele(nvp);
-			}
+			    &nvp, (fhandle_t *)fh.nfsrvfh_data, p, &vpnes);			
 			if (!error && !nd->nd_repstat) {
 			    if (op == NFSV4OP_LOOKUP || op == NFSV4OP_LOOKUPP) {
 				new_mp = nvp->v_mount;
@@ -950,6 +945,11 @@
 			    } else
 				    vrele(nvp);
 			}
+			if (nvp != NULL) {
+				nfsrv_auditpath(nvp, NULL, NULL, 
+					(fhandle_t *)fh.nfsrvfh_data, 1);
+				vrele(nvp);
+			}
 			if (nfsv4_opflag[op].modifyfs)
 				vn_finished_write(temp_mp);
 		    } else if (nfsv4_opflag[op].retfh == 2) {