Received: by 2002:ab2:3350:0:b0:1f4:6588:b3a7 with SMTP id o16csp724060lqe; Sun, 7 Apr 2024 00:26:22 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVNQBaTFmiEyWC2DEph4nQqaZoXMAf1D4KfjOgiy4UgBSdxAZckfnoi+Jj6zFkUewrfEoFgb52YbsIP/zrX4tOPKOWVOw6x9y4HbAhDaw== X-Google-Smtp-Source: AGHT+IG0NkySfHALL/lUhc7DP7K/7/3wRU8adOk8k4Qw2xeVGv2CLmbcGgyxhpxteXEVAsFPUEYV X-Received: by 2002:a05:622a:58d:b0:431:7f86:951c with SMTP id c13-20020a05622a058d00b004317f86951cmr6686720qtb.28.1712474782001; Sun, 07 Apr 2024 00:26:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712474781; cv=pass; d=google.com; s=arc-20160816; b=EPJOAKkDXUGVegkEx5CBoBIR4DgPWAIidEI3ZiiLyavM96UQsvGZGFZBXeX4aoiH4G lMFdhrxEvRT1OBXqP0T39fG7QzSwcR0NXrFbiIjWz9o1tcpcz5XEpBeKuveTXe1s8nTL gbsxKjY2yQNCdxUNPtZ0cSclH0A58JFZJ8RfmjknXgUKjXE+QwP2BP6VMSCc1MMpbFAk mhakHehAsW7pEPTbFX+DqYA5GTtIu1Byp4uXHqF5qbwZHK1iakcZP5l7hjGA0Yh1Yuef iRmjWFcudIcQwMA9rTKsdP0DYw0rHZ5GRwNs5a5TiTUHlS9b1cfiZsKLwfMROc4ThYEa VpOg== ARC-Message-Signature: i=2; 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=0LloRDYuts610/4V/5af8gJDJQZ8U/QgGjdw5MUHcqc=; fh=eLW+fWdexutSV82wpzYqRHT7xIXx30+HypqWzPzY8A0=; b=AZFREBjtl6szyw+drILyaJn5VwBpN/sZ+ouk+7YRB4RbYa0Twv1eecU5BONiAEm1LX wRDof4Ea67hb+eBIU8luV25vnw6O/zhjHcDTCEWZWGW5SxmTqqzYmh6RqIvW7Z45/19B qcsg2OSX3+Q6ONdVKlkXX6cbw4ebNnthtFlwV/c8CiQdqvNaie7ToS7y+5TKE5LWh4Wi fNmja3tjzMZKULrVqis11sA68corLP8AURIhpxz6JZRgwnfL8S1leTCSE912CFUJhqt5 8uaUg0Hn/Uq7SWBTCbIqcB1uHckxs8j+oggSa4jOg4yOkFlyJKtzrXwEdNFWBqZAslF0 B0oQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eh5p1nnE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-134220-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-134220-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. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id t2-20020a05622a180200b00434583d880csi2630285qtc.183.2024.04.07.00.26.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 00:26:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-134220-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eh5p1nnE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-134220-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-134220-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 B3A341C21D2D for ; Sun, 7 Apr 2024 07:26:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2AD22CA7A; Sun, 7 Apr 2024 07:26:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eh5p1nnE" 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 5647B2599 for ; Sun, 7 Apr 2024 07:26:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712474775; cv=none; b=dFrC1vqYJqS5txNqH1nH9rihA31g4AauVos7wlRy236xYXk6lPSJHBSdGYdmYpGvLTtzdGELEdEB+PCpiXBfh+Fw/NBuNL1HMfAgn3jnCbX0sOB5Sj+v7A59f8Z8UMB4TqF1Y4Sv42I1ZYWRkusLQl+dA120stgqn7GDKlpuDyU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712474775; c=relaxed/simple; bh=4yvmXrQIABNgfTHlOdNy+K4jA8VXyviaTqDUNFlSm1g=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=uUU85sSz2OjNFNoQh7oKicyKrOVBjWzXKwWNpYQpIgMUjTOSpLbhH8brieZ2C0WmlTkYNkTOZ/H9xVukayJoiWyLddD9vxtjbJFAl1YHhQu9Xli+/Yq4OnoVPHzyhXicAWmZfl2KnbzB/4nuc+x0zPpSRZe/3SJEJWNmjJEy/kg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eh5p1nnE; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 427D0C433C7; Sun, 7 Apr 2024 07:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712474774; bh=4yvmXrQIABNgfTHlOdNy+K4jA8VXyviaTqDUNFlSm1g=; h=From:To:Cc:Subject:Date:From; b=eh5p1nnEUfUb58qHgCn+7+2N1aCyUBi8S8auz0nYi2fHS9xQnZ18VaOwgVlbs6KMh i+iNBSouoZzr3cvFNNiBE9RYE9rJx0q/bmK+FvZwNQeFK3gms9Xup1c9Kqi5WcMFyb XGa5XHsJS5PwepFX1hQ3OvowWsmYMLkSzKHf0m189bPFlR01tA6U9fabt9XLQPXdXC FfGmdfdXQMK5P7UFtvq3HintezEH/ZrTq1G1pH0ndd5GRRDi2ivKVtivT9BG3h3HXq WKFCIcjksTN1JeL5N2UGCyn+7bgEYRh+bressp72vpzqjISC/68IgBKUMnbcqpNnW4 GBbE2gAVaJ5CA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , Zhiguo Niu Subject: [PATCH 1/2] f2fs: compress: fix to relocate check condition in f2fs_{release,reserve}_compress_blocks() Date: Sun, 7 Apr 2024 15:26:03 +0800 Message-Id: <20240407072604.3488169-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 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 Closes: https://lore.kernel.org/linux-f2fs-devel/CAHJ8P3LdZXLc2rqeYjvymgYHr2+YLuJ0sLG9DdsJZmwO7deuhw@mail.gmail.com Signed-off-by: Chao Yu --- fs/f2fs/file.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 2cd4ca8433e1..ca401cf8152a 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -3549,9 +3549,6 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) if (!f2fs_sb_has_compression(sbi)) return -EOPNOTSUPP; - if (!f2fs_compressed_file(inode)) - return -EINVAL; - if (f2fs_readonly(sbi->sb)) return -EROFS; @@ -3570,7 +3567,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; } @@ -3731,9 +3729,6 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) if (!f2fs_sb_has_compression(sbi)) return -EOPNOTSUPP; - if (!f2fs_compressed_file(inode)) - return -EINVAL; - if (f2fs_readonly(sbi->sb)) return -EROFS; @@ -3745,7 +3740,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; } -- 2.40.1