From mboxrd@z Thu Jan 1 00:00:00 1970 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 D15CC1A3BB5; Wed, 5 Jun 2024 11:52:28 +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=1717588348; cv=none; b=XNcNLCzyCLuL3pdJwA7VD7kJa5QdrCbHcndxfVoWyNM3lFIJRuedguiX7MGOibRO3m/nvELYAOKOgmLTJcGI543wZXZ+VJs7b/hEjqPfKawfzF+mOdDoMwK5Dt/usshnmLoniNmcG5TP4sHBlYy5Ol1nrnFa1H1NVn3PUioQ8tI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717588348; c=relaxed/simple; bh=U6mbqeSfWwgxSCsUcir+acuWxHuovKizLuJkAoTPduE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cZdQ8FXTcGX8XF1tw6LUQ5vmlE1E0/p9hdMXi5WPUMgw9h6OxBoggcov+IYzwlky0sPRGbApTcoRIhSnph6itKdQJ3EtGOaVd3zVqMMccLYheLow9zspKUe5ZGVABPYvI4ibsyDI+nkYR9BtmcuT5G4x1jPC9kBgQrq3N6ggBzw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RfF9nxJ8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RfF9nxJ8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E13CFC32781; Wed, 5 Jun 2024 11:52:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717588348; bh=U6mbqeSfWwgxSCsUcir+acuWxHuovKizLuJkAoTPduE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RfF9nxJ8QFG6EgUCXSBpu3TZXaIdt6Y6QMAo7HeRATkNNZGQtQwOdSCYpvpLeeoqm d0gFgP67dH3nVvr94bo4QDL8IwvYDej6gxHjTX72YWPufH302fvs3oSoqrnZt5JdW/ 1JBuL0I21mMSChgBn709UYA/fP6YK588A34T0sNhUlLUU5E824EQBIcje6Z3r5Xs/J WQdVm1TohZepwzbFP8oYUHMvZysIMyICdmgTp38qHoCmq8glq3pslsBOJB5DSf6Sva 1nkznMmFLYrg/aTHkchaB8unwd455mmXomZxf5UFSERbvPh4ThCJ87Bkql62l8n/D6 Zel4gAWQIELgw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yunlei He , Chao Yu , Jaegeuk Kim , Sasha Levin , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH AUTOSEL 6.6 02/20] f2fs: remove clear SB_INLINECRYPT flag in default_options Date: Wed, 5 Jun 2024 07:51:45 -0400 Message-ID: <20240605115225.2963242-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605115225.2963242-1-sashal@kernel.org> References: <20240605115225.2963242-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.32 Content-Transfer-Encoding: 8bit From: Yunlei He [ Upstream commit ac5eecf481c29942eb9a862e758c0c8b68090c33 ] In f2fs_remount, SB_INLINECRYPT flag will be clear and re-set. If create new file or open file during this gap, these files will not use inlinecrypt. Worse case, it may lead to data corruption if wrappedkey_v0 is enable. Thread A: Thread B: -f2fs_remount -f2fs_file_open or f2fs_new_inode -default_options <- clear SB_INLINECRYPT flag -fscrypt_select_encryption_impl -parse_options <- set SB_INLINECRYPT again Signed-off-by: Yunlei He Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index ab437022ea56f..5d294c8a025ca 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2186,8 +2186,6 @@ static void default_options(struct f2fs_sb_info *sbi, bool remount) F2FS_OPTION(sbi).memory_mode = MEMORY_MODE_NORMAL; F2FS_OPTION(sbi).errors = MOUNT_ERRORS_CONTINUE; - sbi->sb->s_flags &= ~SB_INLINECRYPT; - set_opt(sbi, INLINE_XATTR); set_opt(sbi, INLINE_DATA); set_opt(sbi, INLINE_DENTRY); -- 2.43.0