From owner-svn-src-all@FreeBSD.ORG  Sat Apr 11 20:23:09 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 185B51065674;
	Sat, 11 Apr 2009 20:23:09 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 070438FC18;
	Sat, 11 Apr 2009 20:23:09 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3BKN8fT097657;
	Sat, 11 Apr 2009 20:23:08 GMT (envelope-from kan@svn.freebsd.org)
Received: (from kan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3BKN8si097656;
	Sat, 11 Apr 2009 20:23:08 GMT (envelope-from kan@svn.freebsd.org)
Message-Id: <200904112023.n3BKN8si097656@svn.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Sat, 11 Apr 2009 20:23:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190945 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Apr 2009 20:23:09 -0000

Author: kan
Date: Sat Apr 11 20:23:08 2009
New Revision: 190945
URL: http://svn.freebsd.org/changeset/base/190945

Log:
  Fix v_cache_dd handling for negative entries. v_cache_dd pointer was
  not populated in parent directory if negative entry was being
  created, yet entry itself was added to the nc_neg list. It was
  possible for parent vnode to get discarded later, leaving negative
  entry pointing to now unused memory block.
  
  Reported by:	dho
  Revewed by:	kib

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Sat Apr 11 17:36:11 2009	(r190944)
+++ head/sys/kern/vfs_cache.c	Sat Apr 11 20:23:08 2009	(r190945)
@@ -678,14 +678,19 @@ cache_enter(dvp, vp, cnp)
 		}
 	}
 
-	/*
-	 * See if we are trying to add .. entry, but some other lookup
-	 * has populated v_cache_dd pointer already.
-	 */
-	if (flag == NCF_ISDOTDOT && dvp->v_cache_dd != NULL) {
-		CACHE_WUNLOCK();
-		cache_free(ncp);
-		return;
+	if (flag == NCF_ISDOTDOT) {
+		/*
+		 * See if we are trying to add .. entry, but some other lookup
+		 * has populated v_cache_dd pointer already.
+		 */
+		if (dvp->v_cache_dd != NULL) {
+		    CACHE_WUNLOCK();
+		    cache_free(ncp);
+		    return;
+		}
+		KASSERT(vp == NULL || vp->v_type == VDIR,
+		    ("wrong vnode type %p", vp));
+		dvp->v_cache_dd = ncp;
 	}
 
 	numcache++;
@@ -694,11 +699,7 @@ cache_enter(dvp, vp, cnp)
 		if (cnp->cn_flags & ISWHITEOUT)
 			ncp->nc_flag |= NCF_WHITE;
 	} else if (vp->v_type == VDIR) {
-		if (flag == NCF_ISDOTDOT) {
-			KASSERT(dvp->v_cache_dd == NULL,
-			    ("dangling v_cache_dd"));
-			dvp->v_cache_dd = ncp;
-		} else {
+		if (flag != NCF_ISDOTDOT) {
 			if ((n2 = vp->v_cache_dd) != NULL &&
 			    (n2->nc_flag & NCF_ISDOTDOT) != 0)
 				cache_zap(n2);