f2fs: compress: fix to relocate check condition in f2fs_{release,reserve}_compress_bl...

[ Upstream commit 7c5dffb3d90c5921b91981cc663e02757d90526e ]

Compress flag should be checked after inode lock held to avoid
racing w/ f2fs_setflags_common(), fix it.

Fixes: 4c8ff7095bef ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 3d811594d0d5cfab259de76fab6f70b8dd7f2cbd..1a03d0f33549cefdd86cfe9b94bccdad3609e667 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3439,9 +3439,6 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
        if (!f2fs_sb_has_compression(F2FS_I_SB(inode)))
                return -EOPNOTSUPP;
 
-       if (!f2fs_compressed_file(inode))
-               return -EINVAL;
-
        if (f2fs_readonly(sbi->sb))
                return -EROFS;
 
@@ -3460,7 +3457,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
                goto out;
        }
 
-       if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
+       if (!f2fs_compressed_file(inode) ||
+               is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
                ret = -EINVAL;
                goto out;
        }
@@ -3618,9 +3616,6 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
        if (!f2fs_sb_has_compression(F2FS_I_SB(inode)))
                return -EOPNOTSUPP;
 
-       if (!f2fs_compressed_file(inode))
-               return -EINVAL;
-
        if (f2fs_readonly(sbi->sb))
                return -EROFS;
 
@@ -3635,7 +3630,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
 
        inode_lock(inode);
 
-       if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
+       if (!f2fs_compressed_file(inode) ||
+               !is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
                ret = -EINVAL;
                goto unlock_inode;
        }