mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-11 20:05:22 +02:00
f2fs: remove clear SB_INLINECRYPT flag in default_options
[ Upstream commit ac5eecf481
]
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 <heyunlei@oppo.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
971c3be5db
commit
eddeb8d941
|
@ -2123,8 +2123,6 @@ static void default_options(struct f2fs_sb_info *sbi, bool remount)
|
||||||
F2FS_OPTION(sbi).memory_mode = MEMORY_MODE_NORMAL;
|
F2FS_OPTION(sbi).memory_mode = MEMORY_MODE_NORMAL;
|
||||||
F2FS_OPTION(sbi).errors = MOUNT_ERRORS_CONTINUE;
|
F2FS_OPTION(sbi).errors = MOUNT_ERRORS_CONTINUE;
|
||||||
|
|
||||||
sbi->sb->s_flags &= ~SB_INLINECRYPT;
|
|
||||||
|
|
||||||
set_opt(sbi, INLINE_XATTR);
|
set_opt(sbi, INLINE_XATTR);
|
||||||
set_opt(sbi, INLINE_DATA);
|
set_opt(sbi, INLINE_DATA);
|
||||||
set_opt(sbi, INLINE_DENTRY);
|
set_opt(sbi, INLINE_DENTRY);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user