From 08cf5ceb8e4ed2bd40380cb3d693a25d16c4ad50 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sat, 3 May 2014 16:11:55 +0000 Subject: [PATCH] After r254627, the deupdate() started writing the directory entries to disk. That has a side effect of corrupting the "." entries names on rename, since the call to createde() in the msdosfs_rename() sets the de_Name to the target name. If any change to the directory attributes is performed, the wrong name is written back to the on-disk direntry on update. Overwrite the de_Name for the directories on rename to correct the dot name. Submitted by: bde MFC after: 1 week --- sys/fs/msdosfs/msdosfs_vnops.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 04cb3721e5b..856ec7cbf5b 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1240,6 +1240,17 @@ abortit: VOP_UNLOCK(fvp, 0); goto bad; } + /* + * If ip is for a directory, then its name should always + * be "." since it is for the directory entry in the + * directory itself (msdosfs_lookup() always translates + * to the "." entry so as to get a unique denode, except + * for the root directory there are different + * complications). However, we just corrupted its name + * to pass the correct name to createde(). Undo this. + */ + if ((ip->de_Attributes & ATTR_DIRECTORY) != 0) + bcopy(oldname, ip->de_Name, 11); ip->de_refcnt++; zp->de_fndoffset = from_diroffset; error = removede(zp, ip);