commit 57e65e2b7ad260097b2cf8f321a1413072517f0c
author Jacob Abrams <satur9nine@gmail.com> Fri Sep 02 11:54:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 11:54:12 2016 +0000
tree e35f87effc80b3077753d5dbecd7243b4ee2f23c
parent 87884b141fb785382752142c638678b6d0e65a1c
parent 586a2dbf533cb576e0a832d196cee9dd8f2e3da5

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

Change-Id: Iedd1c87c8a727b4ecb415d16a3fe14907f5206e0

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