commit 83e9c24220f6d8f648acc75c9d6557c81fa79d06
author Jacob Abrams <satur9nine@gmail.com> Fri Sep 02 11:57:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 11:57:42 2016 +0000
tree e35f87effc80b3077753d5dbecd7243b4ee2f23c
parent 1f30270bc082e10465a999e1c594b1af0fcffd75
parent 57e65e2b7ad260097b2cf8f321a1413072517f0c

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

Change-Id: Id102118009e17dbe4c2b7f71cc0960c15fc11a96

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