Skip to content

Commit 7c5dffb

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: compress: fix to relocate check condition in f2fs_{release,reserve}_compress_blocks()
Compress flag should be checked after inode lock held to avoid racing w/ f2fs_setflags_common(), fix it. Fixes: 4c8ff70 ("f2fs: support data compression") Reported-by: Zhiguo Niu <zhiguo.niu@unisoc.com> Closes: https://lore.kernel.org/linux-f2fs-devel/CAHJ8P3LdZXLc2rqeYjvymgYHr2+YLuJ0sLG9DdsJZmwO7deuhw@mail.gmail.com Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 0f9b121 commit 7c5dffb

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

fs/f2fs/file.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3543,9 +3543,6 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
35433543
if (!f2fs_sb_has_compression(sbi))
35443544
return -EOPNOTSUPP;
35453545

3546-
if (!f2fs_compressed_file(inode))
3547-
return -EINVAL;
3548-
35493546
if (f2fs_readonly(sbi->sb))
35503547
return -EROFS;
35513548

@@ -3564,7 +3561,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
35643561
goto out;
35653562
}
35663563

3567-
if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
3564+
if (!f2fs_compressed_file(inode) ||
3565+
is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
35683566
ret = -EINVAL;
35693567
goto out;
35703568
}
@@ -3725,9 +3723,6 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
37253723
if (!f2fs_sb_has_compression(sbi))
37263724
return -EOPNOTSUPP;
37273725

3728-
if (!f2fs_compressed_file(inode))
3729-
return -EINVAL;
3730-
37313726
if (f2fs_readonly(sbi->sb))
37323727
return -EROFS;
37333728

@@ -3739,7 +3734,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
37393734

37403735
inode_lock(inode);
37413736

3742-
if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
3737+
if (!f2fs_compressed_file(inode) ||
3738+
!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
37433739
ret = -EINVAL;
37443740
goto unlock_inode;
37453741
}

0 commit comments

Comments
 (0)