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

Merge "Ignore DE retrieveKey failure for non-user-0"

Browse source
This commit is contained in:
Treehugger Robot 2022-11-29 01:19:25 +00:00 committed by Gerrit Code Review
commit 1cb65f9de5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
FsCrypt.cpp
View file

@ -417,7 +417,11 @@ static bool load_all_de_keys() {
userid_t user_id = std::stoi(entry->d_name);
auto key_path = de_dir + "/" + entry->d_name;
KeyBuffer de_key;
if (!retrieveKey(key_path, kEmptyAuthentication, &de_key)) return false;
if (!retrieveKey(key_path, kEmptyAuthentication, &de_key)) {
// This is probably a partially removed user, so ignore
if (user_id != 0) continue;
return false;
}
EncryptionPolicy de_policy;
if (!install_storage_key(DATA_MNT_POINT, options, de_key, &de_policy)) return false;
auto ret = s_de_policies.insert({user_id, de_policy});