Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: convert inline_data in prior to i_size_write

In below call path, we change i_size before inline conversion, however,
if we failed to convert inline inode, the inode may have wrong i_size
which is larger than max inline size, result inline inode corruption.

- f2fs_setattr
- truncate_setsize
- f2fs_convert_inline_inode

This patch reorders truncate_setsize() and f2fs_convert_inline_inode()
to guarantee inline_data has valid i_size.

Fixes: 0cab80ee0c9e ("f2fs: fix to convert inline inode in ->setattr")
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

+13 -13
+13 -13
fs/f2fs/file.c
··· 814 814 } 815 815 816 816 if (attr->ia_valid & ATTR_SIZE) { 817 - bool to_smaller = (attr->ia_size <= i_size_read(inode)); 817 + loff_t old_size = i_size_read(inode); 818 + 819 + if (attr->ia_size > MAX_INLINE_DATA(inode)) { 820 + /* 821 + * should convert inline inode before i_size_write to 822 + * keep smaller than inline_data size with inline flag. 823 + */ 824 + err = f2fs_convert_inline_inode(inode); 825 + if (err) 826 + return err; 827 + } 818 828 819 829 down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); 820 830 down_write(&F2FS_I(inode)->i_mmap_sem); 821 831 822 832 truncate_setsize(inode, attr->ia_size); 823 833 824 - if (to_smaller) 834 + if (attr->ia_size <= old_size) 825 835 err = f2fs_truncate(inode); 826 836 /* 827 837 * do not trim all blocks after i_size if target size is ··· 839 829 */ 840 830 up_write(&F2FS_I(inode)->i_mmap_sem); 841 831 up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); 842 - 843 832 if (err) 844 833 return err; 845 834 846 - if (!to_smaller) { 847 - /* should convert inline inode here */ 848 - if (!f2fs_may_inline_data(inode)) { 849 - err = f2fs_convert_inline_inode(inode); 850 - if (err) 851 - return err; 852 - } 853 - inode->i_mtime = inode->i_ctime = current_time(inode); 854 - } 855 - 856 835 down_write(&F2FS_I(inode)->i_sem); 836 + inode->i_mtime = inode->i_ctime = current_time(inode); 857 837 F2FS_I(inode)->last_disk_size = i_size_read(inode); 858 838 up_write(&F2FS_I(inode)->i_sem); 859 839 }