diff mbox series

f2fs: compress: fix to check compress flag w/ .i_sem lock

Message ID 20240219022844.3461390-1-chao@kernel.org
State New
Headers
Series f2fs: compress: fix to check compress flag w/ .i_sem lock |

Commit Message

Chao Yu Feb. 19, 2024, 2:28 a.m. UTC 
  It needs to check compress flag w/ .i_sem lock, otherwise, compressed
inode may be disabled after the check condition, it's not needed to
set compress option on non-compress inode.

Fixes: e1e8debec656 ("f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl")
Signed-off-by: Chao Yu <chao@kernel.org>
---
 fs/f2fs/file.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

patchwork-bot+f2fs@kernel.org Feb. 28, 2024, 10:50 p.m. UTC | #1 
Hello:

This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <jaegeuk@kernel.org>:

On Mon, 19 Feb 2024 10:28:44 +0800 you wrote:
> It needs to check compress flag w/ .i_sem lock, otherwise, compressed
> inode may be disabled after the check condition, it's not needed to
> set compress option on non-compress inode.
> 
> Fixes: e1e8debec656 ("f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl")
> Signed-off-by: Chao Yu <chao@kernel.org>
> 
> [...]

Here is the summary with links:
  - [f2fs-dev] f2fs: compress: fix to check compress flag w/ .i_sem lock
    https://git.kernel.org/jaegeuk/f2fs/c/7493c07e31d6

You are awesome, thank you!
diff mbox series

Patch

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index e1e9b98f4408..62b51ac550f0 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4028,16 +4028,20 @@  static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg)
 				sizeof(option)))
 		return -EFAULT;
 
-	if (!f2fs_compressed_file(inode) ||
-			option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
-			option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
-			option.algorithm >= COMPRESS_MAX)
+	if (option.log_cluster_size < MIN_COMPRESS_LOG_SIZE ||
+		option.log_cluster_size > MAX_COMPRESS_LOG_SIZE ||
+		option.algorithm >= COMPRESS_MAX)
 		return -EINVAL;
 
 	file_start_write(filp);
 	inode_lock(inode);
 
 	f2fs_down_write(&F2FS_I(inode)->i_sem);
+	if (!f2fs_compressed_file(inode)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
 	if (f2fs_is_mmap_file(inode) || get_dirty_pages(inode)) {
 		ret = -EBUSY;
 		goto out;