Received: by 2002:a05:7412:e794:b0:fa:551:50a7 with SMTP id o20csp1458721rdd; Wed, 10 Jan 2024 22:44:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9i4u4v1ckvJBq9MKRB+m2Z18zEdJKHzrsbqpdlXo5vPt+kofk97Vx6vP7IJEdp2sk5Mfo X-Received: by 2002:a05:620a:28d3:b0:783:2fc5:3dfa with SMTP id l19-20020a05620a28d300b007832fc53dfamr1160676qkp.155.1704955471379; Wed, 10 Jan 2024 22:44:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704955471; cv=none; d=google.com; s=arc-20160816; b=P4U4nkqYdOx8DWNSEbVUNnzFDH8Yik98imAfPiOIpXdnHnW9Kq7xyR/FP6aP8WI8AB gd2kihwDHVroOIv6LfGKI98ia2c8373ttdvspRPx/leEjFf4+XFhpwGfKN9fISP1MzUz mT3gcS6blFDiqUEu84By0DzcPT+jmhDIQ4s1UtSvUGwc3X4QhntlhEC7x/+vjBFNfBQz 3FybHH59bdjvb84QMxkB/KBW2/OIGqMbSp51xejdRKLaWc1AEFYF1uzaaux+DehVo/Vx /91hY/THm0OSYeuHQZa/K5pIVakD9w57LbCoWMNVqOSHKtpoAdNlNaTHbmOltj8ejL6y TW/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=nS3yEtZzKvSluZ6LIwm28rAt0s8KRshkEHKE0yeCqS4=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=NK6vdlT9go8OFfM6+VlyoHWWOl3hM17znsZoT2fwVzCpFIkx4IS0s/q7N71jhwdH13 ftTEzFD5UF9Nv6X2oMAZup0T0Sx7g92G0GjQO4vs29U+q+VTRH9Zrhfj861oq5TNzM4U kMNyYxnu8MxVsFeTA7++4fUkAJn33gD/ForjaQOEBEJTHjEdHSQoGbs2C72yWkdJlOqY ALUQi1/sAbhLg4gHuq3JENFikv5PJ7/b5MiefMW5HO/7ZD+E2X7zGYEFreLVQyBO9GQG KukQx3QANMvc5ZuK+PWpnrIft/8brM8Z/vHtyvu9nCHQHWHzkSeys6a/Kxp7GfYKPgcr 3l4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LJrCKw9O; spf=pass (google.com: domain of linux-kernel+bounces-23112-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23112-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id c26-20020a05620a269a00b007815f7168e6si383310qkp.35.2024.01.10.22.44.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 22:44:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-23112-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LJrCKw9O; spf=pass (google.com: domain of linux-kernel+bounces-23112-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23112-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 20CAB1C24B83 for ; Thu, 11 Jan 2024 06:44:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C67CC63A0; Thu, 11 Jan 2024 06:44:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LJrCKw9O" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06F1D610D for ; Thu, 11 Jan 2024 06:44:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F69EC433F1; Thu, 11 Jan 2024 06:44:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704955452; bh=Yt2x1VIugdYVXsOxoBOVxcIohw/X1vEQrQchbterPrg=; h=From:To:Cc:Subject:Date:From; b=LJrCKw9ObJhB5WOPt9fG/KvCfAARHtMVBKRloB6IGXiC2c8QIuZaZqg3vLPBQcmif l5Oya0vqJMNBwxbp3Aw3+lJUvgKF/Ns1UWShYNEdcBoLlK9s240rn8GpX0m55Axcnj Negd12cyLVdZ587YXF2EpRJea/TU0uM+mQc263D+QYHwNwMVYO7rz4hupiCXThi7CM GneEhT6fiFoA6Ke/1hd8cP9R9Ln6by10eQADUy/rIeSacYkKC9YdQslORNGfzDAn6c ycUFU9kI/svDBz/4S7CKRo0GBOFOgry8oQRnpTUrfxS/BiQ4KnL8QoY67GJuqaAoqe aRUatm4c8/5cw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] f2fs: compress: fix to cover f2fs_disable_compressed_file() w/ i_sem Date: Thu, 11 Jan 2024 14:44:06 +0800 Message-Id: <20240111064406.2970205-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit - f2fs_disable_compressed_file - check inode_has_data - f2fs_file_mmap - mkwrite - f2fs_get_block_locked : update metadata in compressed inode's disk layout - fi->i_flags &= ~F2FS_COMPR_FL - clear_inode_flag(inode, FI_COMPRESSED_FILE); we should use i_sem lock to prevent above race case. Meanwhile, this patch adds i_size check to restrict compress inode conversion condition. Fixes: 4c8ff7095bef ("f2fs: support data compression") Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 18 ++++++++++++++++-- fs/f2fs/file.c | 5 ++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 74729db0b381..e2e0ca45f881 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4406,19 +4406,33 @@ static inline int set_compress_context(struct inode *inode) #endif } +static inline bool inode_has_data(struct inode *inode) +{ + return (S_ISREG(inode->i_mode) && + (F2FS_HAS_BLOCKS(inode) || i_size_read(inode))); +} + static inline bool f2fs_disable_compressed_file(struct inode *inode) { struct f2fs_inode_info *fi = F2FS_I(inode); - if (!f2fs_compressed_file(inode)) + f2fs_down_write(&F2FS_I(inode)->i_sem); + + if (!f2fs_compressed_file(inode)) { + f2fs_up_write(&F2FS_I(inode)->i_sem); return true; - if (S_ISREG(inode->i_mode) && F2FS_HAS_BLOCKS(inode)) + } + if (f2fs_is_mmap_file(inode) || inode_has_data(inode)) { + f2fs_up_write(&F2FS_I(inode)->i_sem); return false; + } fi->i_flags &= ~F2FS_COMPR_FL; stat_dec_compr_inode(inode); clear_inode_flag(inode, FI_COMPRESSED_FILE); f2fs_mark_inode_dirty_sync(inode, true); + + f2fs_up_write(&F2FS_I(inode)->i_sem); return true; } diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 0e4c871d6aed..5e5df234eb92 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1926,8 +1926,7 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) f2fs_down_write(&F2FS_I(inode)->i_sem); if (!f2fs_may_compress(inode) || - (S_ISREG(inode->i_mode) && - F2FS_HAS_BLOCKS(inode))) { + inode_has_data(inode)) { f2fs_up_write(&F2FS_I(inode)->i_sem); return -EINVAL; } @@ -4011,7 +4010,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg) goto out; } - if (F2FS_HAS_BLOCKS(inode)) { + if (inode_has_data(inode)) { ret = -EFBIG; goto out; } -- 2.40.1