Skip to content

Commit bd9ae4a

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: compress: fix to relocate check condition in f2fs_ioc_{,de}compress_file()
Compress flag should be checked after inode lock held to avoid racing w/ f2fs_setflags_common() , fix it. Fixes: 5fdb322 ("f2fs: add F2FS_IOC_DECOMPRESS_FILE and F2FS_IOC_COMPRESS_FILE") 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 7c5dffb commit bd9ae4a

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
@@ -4136,9 +4136,6 @@ static int f2fs_ioc_decompress_file(struct file *filp)
41364136
if (!(filp->f_mode & FMODE_WRITE))
41374137
return -EBADF;
41384138

4139-
if (!f2fs_compressed_file(inode))
4140-
return -EINVAL;
4141-
41424139
f2fs_balance_fs(sbi, true);
41434140

41444141
file_start_write(filp);
@@ -4149,7 +4146,8 @@ static int f2fs_ioc_decompress_file(struct file *filp)
41494146
goto out;
41504147
}
41514148

4152-
if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
4149+
if (!f2fs_compressed_file(inode) ||
4150+
is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
41534151
ret = -EINVAL;
41544152
goto out;
41554153
}
@@ -4214,9 +4212,6 @@ static int f2fs_ioc_compress_file(struct file *filp)
42144212
if (!(filp->f_mode & FMODE_WRITE))
42154213
return -EBADF;
42164214

4217-
if (!f2fs_compressed_file(inode))
4218-
return -EINVAL;
4219-
42204215
f2fs_balance_fs(sbi, true);
42214216

42224217
file_start_write(filp);
@@ -4227,7 +4222,8 @@ static int f2fs_ioc_compress_file(struct file *filp)
42274222
goto out;
42284223
}
42294224

4230-
if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
4225+
if (!f2fs_compressed_file(inode) ||
4226+
is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
42314227
ret = -EINVAL;
42324228
goto out;
42334229
}

0 commit comments

Comments
 (0)