tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fs_mgr: allow FDE options in recovery mode"

Browse source
This commit is contained in:
Eric Biggers 2021-11-12 23:28:04 +00:00 committed by Gerrit Code Review
commit d0ed71dcb7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/fs_mgr_fstab.cpp
View file

@ -306,7 +306,13 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
}
}
if (entry->fs_mgr_flags.crypt && !entry->fs_mgr_flags.vold_managed) {
// FDE is no longer supported, so reject "encryptable" when used without
// "vold_managed". For now skip this check when in recovery mode, since
// some recovery fstabs still contain the FDE options since they didn't do
// anything in recovery mode anyway (except possibly to cause the
// reservation of a crypto footer) and thus never got removed.
if (entry->fs_mgr_flags.crypt && !entry->fs_mgr_flags.vold_managed &&
access("/system/bin/recovery", F_OK) != 0) {
LERROR << "FDE is no longer supported; 'encryptable' can only be used for adoptable "
"storage";
return false;