commit 586a2dbf533cb576e0a832d196cee9dd8f2e3da5
author Jacob Abrams <satur9nine@gmail.com> Fri Sep 02 11:50:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 11:50:45 2016 +0000
tree e35f87effc80b3077753d5dbecd7243b4ee2f23c
parent 451f205ba2744effd53fd3555cdc4080c14d7d9b
parent 71251eec8d5059814e3042d96fbe0c5e1b42681b

Merge "Reduce chance of zero-length keystore files"
am: 71251eec8d

Change-Id: I770e609b45515799020c352aa9ed4999e7989ddd

keystore/keystore_utils.cpp

diff --git a/keystore/keystore_utils.cpp b/keystore/keystore_utils.cpp
index b653dd8..4617afd 100644
--- a/keystore/keystore_utils.cpp
+++ b/keystore/keystore_utils.cpp
@@ -51,6 +51,10 @@
         data += n;
         remaining -= n;
     }
+    if (TEMP_FAILURE_RETRY(fsync(fd)) == -1) {
+        ALOGW("fsync failed: %s", strerror(errno));
+        return -1;
+    }
     return size;
 }