Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb834a70 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

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: 0cab80ee ("f2fs: fix to convert inline inode in ->setattr")
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 353f7c93

fs/f2fs/file.c

+13 −13
Original line number Diff line number Diff line
@@ -822,14 +822,24 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) 
	}



	if (attr->ia_valid & ATTR_SIZE) {

		bool to_smaller = (attr->ia_size <= i_size_read(inode));

		loff_t old_size = i_size_read(inode);



		if (attr->ia_size > MAX_INLINE_DATA(inode)) {

			/*

			 * should convert inline inode before i_size_write to

			 * keep smaller than inline_data size with inline flag.

			 */

			err = f2fs_convert_inline_inode(inode);

			if (err)

				return err;

		}



		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);

		down_write(&F2FS_I(inode)->i_mmap_sem);



		truncate_setsize(inode, attr->ia_size);



		if (to_smaller)

		if (attr->ia_size <= old_size)

			err = f2fs_truncate(inode);

		/*

		 * do not trim all blocks after i_size if target size is
@@ -837,21 +847,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) 
		 */

		up_write(&F2FS_I(inode)->i_mmap_sem);

		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);



		if (err)

			return err;



		if (!to_smaller) {

			/* should convert inline inode here */

			if (!f2fs_may_inline_data(inode)) {

				err = f2fs_convert_inline_inode(inode);

				if (err)

					return err;

			}

			inode->i_mtime = inode->i_ctime = current_time(inode);

		}



		down_write(&F2FS_I(inode)->i_sem);

		inode->i_mtime = inode->i_ctime = current_time(inode);

		F2FS_I(inode)->last_disk_size = i_size_read(inode);

		up_write(&F2FS_I(inode)->i_sem);

	}