Merge "Fsync directories before delete key" am: 7573874d3f am: 3a38070bbf

am: 08613423ee Change-Id: I6007af911ba3fcafad590d33deea25a5c55b03c3
5 years ago · a475189b32
parent 8924680dfb 08613423ee
commit a475189b32
1 changed files with 4 additions and 0 deletions
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@ -224,6 +224,10 @@ static KeymasterOperation begin(Keymaster& keymaster, const std::string& dir,
                PLOG(ERROR) << "Unable to move upgraded key to location: " << kmKeyPath;
                return KeymasterOperation();
            }
+            if (!android::vold::FsyncDirectory(dir)) {
+                LOG(ERROR) << "Key dir sync failed: " << dir;
+                return KeymasterOperation();
+            }
            if (!keymaster.deleteKey(kmKey)) {
                LOG(ERROR) << "Key deletion failed during upgrade, continuing anyway: " << dir;
            }