commit 7573874d3fb9ec9d4aaeb013447ee51c23c9b7da
author Chris Fries <cfries@google.com> Thu Mar 14 15:19:20 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 14 15:19:20 2019 +0000
tree 9e92985094a3946cda872b4d1c19f3ba61e76db6
parent 027fe9217c40f4cc641bd2413d139dc082f4a001
parent 37c82f5c0f7599ef526f3c9d7521c80edf0bc133

Merge "Fsync directories before delete key"

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index fc700c5..42890ca 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -224,6 +224,10 @@
                 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;
             }