commit 9e3f17a57e37b91d2f410baf4f10f842f894350e
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 19 00:03:53 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 19 00:03:53 2023 +0000
tree a4ad411ae1d4bf49bbff390a79222af9306a0e07
parent 45a3d47fd5bb3ffd095a14586d4ca387b15fc242
parent fb9aadaf48f328f7bcdb2a84fbcf5364bb6562ba

Merge "Do not delete all keys after creating a first crypt device"

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 0396138..a0f7b8b 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -118,7 +118,7 @@
     return true;
 }
 
-static bool read_key(const std::string& metadata_key_dir, const KeyGeneration& gen,
+static bool read_key(const std::string& metadata_key_dir, const KeyGeneration& gen, bool first_key,
                      KeyBuffer* key) {
     if (metadata_key_dir.empty()) {
         LOG(ERROR) << "Failed to get metadata_key_dir";
@@ -130,7 +130,7 @@
     if (!MkdirsSync(dir, 0700)) return false;
     auto in_dsu = android::base::GetBoolProperty("ro.gsid.image_running", false);
     // !pathExists(dir) does not imply there's a factory reset when in DSU mode.
-    if (!pathExists(dir) && !in_dsu) {
+    if (!pathExists(dir) && !in_dsu && first_key) {
         auto delete_all = android::base::GetBoolProperty(
                 "ro.crypto.metadata_init_delete_all_keys.enabled", false);
         if (delete_all) {
@@ -290,7 +290,7 @@
     }
     auto gen = needs_encrypt ? makeGen(options) : neverGen();
     KeyBuffer key;
-    if (!read_key(default_metadata_key_dir, gen, &key)) {
+    if (!read_key(default_metadata_key_dir, gen, true, &key)) {
         LOG(ERROR) << "read_key failed in mountFstab";
         return false;
     }
@@ -308,7 +308,7 @@
     if (!zoned_device.empty()) {
         auto zoned_metadata_key_dir = data_rec->metadata_key_dir + "/zoned";
 
-        if (!read_key(zoned_metadata_key_dir, gen, &key)) {
+        if (!read_key(zoned_metadata_key_dir, gen, false, &key)) {
             LOG(ERROR) << "read_key failed with zoned device: " << zoned_device;
             return false;
         }