From owner-svn-src-projects@FreeBSD.ORG  Wed Jul 25 17:15:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06A92106564A;
	Wed, 25 Jul 2012 17:15:53 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E6CF98FC0A;
	Wed, 25 Jul 2012 17:15:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PHFqTx080887;
	Wed, 25 Jul 2012 17:15:52 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PHFqui080885;
	Wed, 25 Jul 2012 17:15:52 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201207251715.q6PHFqui080885@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 25 Jul 2012 17:15:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238773 - projects/fuse/sys/fs/fuse
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 17:15:53 -0000

Author: attilio
Date: Wed Jul 25 17:15:52 2012
New Revision: 238773
URL: http://svn.freebsd.org/changeset/base/238773

Log:
  In VOP_RMDIR and VOP_REMOVE the last comonent name will be used, thus
  when doing lookup the buffer must not be freed when nameiop == DELETE.
  
  Reported by:	pho
  Tested by:	pho, flo

Modified:
  projects/fuse/sys/fs/fuse/fuse_vnops.c

Modified: projects/fuse/sys/fs/fuse/fuse_vnops.c
==============================================================================
--- projects/fuse/sys/fs/fuse/fuse_vnops.c	Wed Jul 25 13:11:36 2012	(r238772)
+++ projects/fuse/sys/fs/fuse/fuse_vnops.c	Wed Jul 25 17:15:52 2012	(r238773)
@@ -871,19 +871,19 @@ calldaemon:
 			if (nid == VTOI(dvp)) {
 				vref(dvp);
 				*vpp = dvp;
-				goto out;
-			}
-			err = fuse_vnode_get(dvp->v_mount,
-			    nid,
-			    dvp,
-			    &vp,
-			    cnp,
-			    IFTOVT(fattr->mode));
-			if (err) {
-				goto out;
+			} else {
+				err = fuse_vnode_get(dvp->v_mount, nid, dvp,
+				    &vp, cnp, IFTOVT(fattr->mode));
+				if (err)
+					goto out;
+				*vpp = vp;
 			}
-			*vpp = vp;
 
+			/*
+			 * Save the name for use in VOP_RMDIR and VOP_REMOVE
+			 * later.
+			 */
+			cnp->cn_flags |= SAVENAME;
 			goto out;
 
 		}