Skip to content

Commit 0f63e33

Browse files
Ye Bingregkh
Ye Bin
authored andcommitted
f2fs: fix null-ptr-deref in f2fs_get_dnode_of_data
commit 4a2c5b7 upstream. There is issue as follows when test f2fs atomic write: F2FS-fs (loop0): Can't find valid F2FS filesystem in 2th superblock F2FS-fs (loop0): invalid crc_offset: 0 F2FS-fs (loop0): f2fs_check_nid_range: out-of-range nid=1, run fsck to fix. F2FS-fs (loop0): f2fs_check_nid_range: out-of-range nid=2, run fsck to fix. ================================================================== BUG: KASAN: null-ptr-deref in f2fs_get_dnode_of_data+0xac/0x16d0 Read of size 8 at addr 0000000000000028 by task rep/1990 CPU: 4 PID: 1990 Comm: rep Not tainted 5.19.0-rc6-next-20220715 raspberrypi#266 Call Trace: <TASK> dump_stack_lvl+0x6e/0x91 print_report.cold+0x49a/0x6bb kasan_report+0xa8/0x130 f2fs_get_dnode_of_data+0xac/0x16d0 f2fs_do_write_data_page+0x2a5/0x1030 move_data_page+0x3c5/0xdf0 do_garbage_collect+0x2015/0x36c0 f2fs_gc+0x554/0x1d30 f2fs_balance_fs+0x7f5/0xda0 f2fs_write_single_data_page+0xb66/0xdc0 f2fs_write_cache_pages+0x716/0x1420 f2fs_write_data_pages+0x84f/0x9a0 do_writepages+0x130/0x3a0 filemap_fdatawrite_wbc+0x87/0xa0 file_write_and_wait_range+0x157/0x1c0 f2fs_do_sync_file+0x206/0x12d0 f2fs_sync_file+0x99/0xc0 vfs_fsync_range+0x75/0x140 f2fs_file_write_iter+0xd7b/0x1850 vfs_write+0x645/0x780 ksys_write+0xf1/0x1e0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd As 3db1de0 commit changed atomic write way which new a cow_inode for atomic write file, and also mark cow_inode as FI_ATOMIC_FILE. When f2fs_do_write_data_page write cow_inode will use cow_inode's cow_inode which is NULL. Then will trigger null-ptr-deref. To solve above issue, introduce FI_COW_FILE flag for COW inode. Fiexes: 3db1de0("f2fs: change the current atomic write way") Signed-off-by: Ye Bin <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5fa6da2 commit 0f63e33

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

fs/f2fs/f2fs.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,7 @@ enum {
756756
FI_ENABLE_COMPRESS, /* enable compression in "user" compression mode */
757757
FI_COMPRESS_RELEASED, /* compressed blocks were released */
758758
FI_ALIGNED_WRITE, /* enable aligned write */
759+
FI_COW_FILE, /* indicate COW file */
759760
FI_MAX, /* max flag, never be used */
760761
};
761762

@@ -3188,6 +3189,11 @@ static inline bool f2fs_is_atomic_file(struct inode *inode)
31883189
return is_inode_flag_set(inode, FI_ATOMIC_FILE);
31893190
}
31903191

3192+
static inline bool f2fs_is_cow_file(struct inode *inode)
3193+
{
3194+
return is_inode_flag_set(inode, FI_COW_FILE);
3195+
}
3196+
31913197
static inline bool f2fs_is_first_block_written(struct inode *inode)
31923198
{
31933199
return is_inode_flag_set(inode, FI_FIRST_BLOCK_WRITTEN);

fs/f2fs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2055,7 +2055,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
20552055
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
20562056

20572057
set_inode_flag(inode, FI_ATOMIC_FILE);
2058-
set_inode_flag(fi->cow_inode, FI_ATOMIC_FILE);
2058+
set_inode_flag(fi->cow_inode, FI_COW_FILE);
20592059
clear_inode_flag(fi->cow_inode, FI_INLINE_DATA);
20602060
f2fs_up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
20612061

fs/f2fs/segment.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)
193193
if (f2fs_is_atomic_file(inode)) {
194194
if (clean)
195195
truncate_inode_pages_final(inode->i_mapping);
196-
clear_inode_flag(fi->cow_inode, FI_ATOMIC_FILE);
196+
clear_inode_flag(fi->cow_inode, FI_COW_FILE);
197197
iput(fi->cow_inode);
198198
fi->cow_inode = NULL;
199199
clear_inode_flag(inode, FI_ATOMIC_FILE);
@@ -3167,7 +3167,7 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)
31673167
return CURSEG_COLD_DATA;
31683168
if (file_is_hot(inode) ||
31693169
is_inode_flag_set(inode, FI_HOT_DATA) ||
3170-
f2fs_is_atomic_file(inode))
3170+
f2fs_is_cow_file(inode))
31713171
return CURSEG_HOT_DATA;
31723172
return f2fs_rw_hint_to_seg_type(inode->i_write_hint);
31733173
} else {

0 commit comments

Comments
 (0)