ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "FscryptInstallKeyring: don't re-create keyring if it's already created"

Browse source
This commit is contained in:
Nikita Ioffe 2019-12-04 19:27:52 +00:00 • committed by Gerrit Code Review
commit cafa75ca22
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/builtins.cpp
View file

@ -583,7 +583,7 @@ static Result<void> queue_fs_event(int code, bool userdata_remount) {
return reboot_into_recovery(options);
/* If reboot worked, there is no return. */
} else if (code == FS_MGR_MNTALL_DEV_FILE_ENCRYPTED) {
if (!userdata_remount && !FscryptInstallKeyring()) {
if (!FscryptInstallKeyring()) {
return Error() << "FscryptInstallKeyring() failed";
}
property_set("ro.crypto.state", "encrypted");
@ -594,7 +594,7 @@ static Result<void> queue_fs_event(int code, bool userdata_remount) {
ActionManager::GetInstance().QueueEventTrigger("nonencrypted");
return {};
} else if (code == FS_MGR_MNTALL_DEV_IS_METADATA_ENCRYPTED) {
if (!userdata_remount && !FscryptInstallKeyring()) {
if (!FscryptInstallKeyring()) {
return Error() << "FscryptInstallKeyring() failed";
}
property_set("ro.crypto.state", "encrypted");
@ -605,7 +605,7 @@ static Result<void> queue_fs_event(int code, bool userdata_remount) {
ActionManager::GetInstance().QueueEventTrigger("nonencrypted");
return {};
} else if (code == FS_MGR_MNTALL_DEV_NEEDS_METADATA_ENCRYPTION) {
if (!userdata_remount && !FscryptInstallKeyring()) {
if (!FscryptInstallKeyring()) {
return Error() << "FscryptInstallKeyring() failed";
}
property_set("ro.crypto.state", "encrypted");

4
init/fscrypt_init_extensions.cpp
View file

@ -42,6 +42,10 @@
using namespace android::fscrypt;
bool FscryptInstallKeyring() {
if (keyctl_search(KEY_SPEC_SESSION_KEYRING, "keyring", "fscrypt", 0) != -1) {
LOG(INFO) << "Keyring is already created";
return true;
}
key_serial_t device_keyring = add_key("keyring", "fscrypt", 0, 0, KEY_SPEC_SESSION_KEYRING);
if (device_keyring == -1) {