Skip to content

Commit

Permalink
f2fs: reposition unlock_new_inode to prevent accessing invalid inode
Browse files Browse the repository at this point in the history
As the race condition on the inode cache, following scenario can appear:
[Thread a]				[Thread b]
					->f2fs_mkdir
					  ->f2fs_add_link
					    ->__f2fs_add_link
					      ->init_inode_metadata failed here
->gc_thread_func
  ->f2fs_gc
    ->do_garbage_collect
      ->gc_data_segment
        ->f2fs_iget
          ->iget_locked
            ->wait_on_inode
					  ->unlock_new_inode
        ->move_data_page
					  ->make_bad_inode
					  ->iput

When we fail in create/symlink/mkdir/mknod/tmpfile, the new allocated inode
should be set as bad to avoid being accessed by other thread. But in above
scenario, it allows f2fs to access the invalid inode before this inode was set
as bad.
This patch fix the potential problem, and this issue was found by code review.

change log from v1:
 o Add condition judgment in gc_data_segment() suggested by Changman Lee.
 o use iget_failed to simplify code.

Signed-off-by: Chao Yu <[email protected]>
Signed-off-by: Jaegeuk Kim <[email protected]>
  • Loading branch information
chaseyu authored and Jaegeuk Kim committed Sep 2, 2014
1 parent 3304b56 commit b73e528
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
2 changes: 1 addition & 1 deletion fs/f2fs/gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ static void gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,

if (phase == 2) {
inode = f2fs_iget(sb, dni.ino);
if (IS_ERR(inode))
if (IS_ERR(inode) || is_bad_inode(inode))
continue;

start_bidx = start_bidx_of_node(nofs, F2FS_I(inode));
Expand Down
20 changes: 5 additions & 15 deletions fs/f2fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,7 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
return 0;
out:
clear_nlink(inode);
unlock_new_inode(inode);
make_bad_inode(inode);
iput(inode);
iget_failed(inode);
alloc_nid_failed(sbi, ino);
return err;
}
Expand Down Expand Up @@ -267,9 +265,7 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,
return err;
out:
clear_nlink(inode);
unlock_new_inode(inode);
make_bad_inode(inode);
iput(inode);
iget_failed(inode);
alloc_nid_failed(sbi, inode->i_ino);
return err;
}
Expand Down Expand Up @@ -308,9 +304,7 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
out_fail:
clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
clear_nlink(inode);
unlock_new_inode(inode);
make_bad_inode(inode);
iput(inode);
iget_failed(inode);
alloc_nid_failed(sbi, inode->i_ino);
return err;
}
Expand Down Expand Up @@ -354,9 +348,7 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,
return 0;
out:
clear_nlink(inode);
unlock_new_inode(inode);
make_bad_inode(inode);
iput(inode);
iget_failed(inode);
alloc_nid_failed(sbi, inode->i_ino);
return err;
}
Expand Down Expand Up @@ -688,9 +680,7 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
out:
f2fs_unlock_op(sbi);
clear_nlink(inode);
unlock_new_inode(inode);
make_bad_inode(inode);
iput(inode);
iget_failed(inode);
alloc_nid_failed(sbi, inode->i_ino);
return err;
}
Expand Down

0 comments on commit b73e528

Please sign in to comment.