f2fs: fix potential corruption when moving a directory
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: fix potential corruption when moving a directory
F2FS has the same issue in ext4_rename causing crash revealed by xfstests/generic/707.
See also commit 0813299c586b ("ext4: Fix possible corruption when moving a directory")
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/namei.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
fs/f2fs/namei.c +15 -1
@@ -995,12 +995,20 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir, goto out; } +/* +* Copied from ext4_rename: we need to protect against old.inode +* directory getting converted from inline directory format into +* a normal one. +*/ +if (S_ISDIR (old_inode->i_mode)) +inode_lock_nested (old_inode,I_MUTEX_NONDIR2 ); + err = -ENOENT ; old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) {if (IS_ERR (old_page)) err =PTR_ERR (old_page); - goto out; + goto out_unlock_old; }if (S_ISDIR (old_inode->i_mode)) {
@@ -1108,6 +1116,9 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,f2fs_unlock_op (sbi); +if (S_ISDIR (old_inode->i_mode)) +inode_unlock (old_inode); +if (IS_DIRSYNC (old_dir) ||IS_DIRSYNC (new_dir))f2fs_sync_fs (sbi->sb,1 );
@@ -1122,6 +1133,9 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir,f2fs_put_page (old_dir_page,0 ); out_old:f2fs_put_page (old_page,0 ); +out_unlock_old: +if (S_ISDIR (old_inode->i_mode)) +inode_unlock (old_inode); out:iput (whiteout);return err;
Signature · 1 line
2.40.0.577.gac1e443424-goog
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 9 lines · On Thu, 6 Apr 2023 12:51:22 -0700 you wrote:
F2FS has the same issue in
ext4_renamecausing crash revealed by xfstests/generic/707.See also commit
0813299c586b("ext4: Fix possible corruption when moving a directory")Signed-off-by Jaegeuk Kim <[email protected]>[...]
Here is the summary with links:
- [f2fs-dev] f2fs: fix potential corruption when moving a directory
https://git.kernel.org/jaegeuk/f2fs/c/004620a236bd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html