Skip to contentSkip to conversation

fs/ntfs3: fix syncing wrong inode on DIRSYNC cross-directory rename

PATCH New Zhan Xusheng 2 participants 3 messages Apr 22 – May 22

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/ntfs3: fix syncing wrong inode on DIRSYNC cross-directory rename

In ntfs3_rename(), when IS_DIRSYNC(new_dir) is true, the code syncs the renamed file inode instead of the target directory new_dir:
if (IS_DIRSYNC(new_dir))
ntfs_sync_inode(inode); /* should be new_dir */

DIRSYNC requires that directory metadata changes are written to disk synchronously. Since new_dir was modified (a new directory entry was added), it is new_dir that must be synced to satisfy the guarantee, not the renamed file itself.

This bug has existed since the initial ntfs3 implementation and was carried through the refactoring in commit 78ab59fee07f ("fs/ntfs3: Rework file operations").

Fix by syncing new_dir instead of inode.

Fixes 4342306f0f0d ("fs/ntfs3: Add file operations and implementation")
---
 fs/ntfs3/namei.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/namei.c +1 -1
index b2af8f695e60..64cde1a856f4 100644
@@ -340,7 +340,7 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,
 			ntfs_sync_inode(dir);
 
 		if (IS_DIRSYNC(new_dir))
-			ntfs_sync_inode(inode);
+			ntfs_sync_inode(new_dir);
 	}
 
 	if (dir_ni != new_dir_ni)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/1 fs/ntfs3: fix syncing wrong inode on DIRSYNC cross-directory rename

In ntfs3_rename(), when IS_DIRSYNC(new_dir) is true, the code syncs the renamed file inode instead of the target directory new_dir:
if (IS_DIRSYNC(new_dir))
ntfs_sync_inode(inode); /* should be new_dir */

DIRSYNC requires that directory metadata changes are written to disk synchronously. Since new_dir was modified (a new directory entry was added), it is new_dir that must be synced to satisfy the guarantee, not the renamed file itself.

This bug has existed since the initial ntfs3 implementation and was carried through the refactoring in commit 78ab59fee07f ("fs/ntfs3: Rework file operations").

Fix by syncing new_dir instead of inode.

Fixes 4342306f0f0d ("fs/ntfs3: Add file operations and implementation")

---
v2:
- Cc [email protected] (was missing in v1, see
https://lore.kernel.org/all/[email protected]/).
- Add Cc: [email protected]; this is a data-persistence bug under DIRSYNC and affects all ntfs3 since 4342306f0f0d.
v1: https://lore.kernel.org/all/[email protected]/

---
 fs/ntfs3/namei.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/namei.c +1 -1
index b2af8f695e60..64cde1a856f4 100644
@@ -340,7 +340,7 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,
 			ntfs_sync_inode(dir);
 
 		if (IS_DIRSYNC(new_dir))
-			ntfs_sync_inode(inode);
+			ntfs_sync_inode(new_dir);
 	}
 
 	if (dir_ni != new_dir_ni)
Signature · 1 line
2.43.0
#2 lore raw
Quoted 35 lines · Zhan Xusheng

In ntfs3_rename(), when IS_DIRSYNC(new_dir) is true, the code syncs the renamed file inode instead of the target directory new_dir:
if (IS_DIRSYNC(new_dir))
ntfs_sync_inode(inode); /* should be new_dir */

DIRSYNC requires that directory metadata changes are written to disk synchronously. Since new_dir was modified (a new directory entry was added), it is new_dir that must be synced to satisfy the guarantee, not the renamed file itself.

This bug has existed since the initial ntfs3 implementation and was carried through the refactoring in commit 78ab59fee07f ("fs/ntfs3: Rework file operations").

Fix by syncing new_dir instead of inode.

Fixes 4342306f0f0d ("fs/ntfs3: Add file operations and implementation")

---
v2:
- Cc [email protected] (was missing in v1, see

    https://lore.kernel.org/all/[email protected]/).
  - Add Cc: [email protected]; this is a data-persistence bug under
    DIRSYNC and affects all ntfs3 since 4342306f0f0d.
v1: https://lore.kernel.org/all/[email protected]/
---
  fs/ntfs3/namei.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/namei.c +0 -0
index b2af8f695e60..64cde1a856f4 100644

fs/ntfs3/namei.c static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir, · line 346

Quoted 8 lines
fs/ntfs3/namei.c +1 -1
@@ -340,7 +340,7 @@ static int ntfs_rename(struct mnt_idmap *idmap, struct inode *dir,
  			ntfs_sync_inode(dir);
 
  		if (IS_DIRSYNC(new_dir))
-			ntfs_sync_inode(inode);
+			ntfs_sync_inode(new_dir);
  	}
 
  	if (dir_ni != new_dir_ni)

Hello,

Sorry for the delay.
Applied, thank you.

Regards,
Konstantin