Date: Wed, 25 Jul 2012 17:15:52 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r238773 - projects/fuse/sys/fs/fuse Message-ID: <201207251715.q6PHFqui080885@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207251715.q6PHFqui080885>