commit 08613423ee9aa55088a96c50c964fc16d2dc24d9
author Chris Fries <cfries@google.com> Thu Mar 14 08:40:08 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 14 08:40:08 2019 -0700
tree 9e92985094a3946cda872b4d1c19f3ba61e76db6
parent 1c4f1e80e0a2fd5807b17ebdde217ecc4c261bd2
parent 3a38070bbfd16875b4f767297becc43dde198913

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

Change-Id: I568a6e8a39929b77ba76b021657e248a4e49e470

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;
             }