commit ae5dbbf5eb45db4227cdc070073b6d5c65a166eb
author Jacob Abrams <satur9nine@gmail.com> Fri Sep 02 12:00:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 12:00:43 2016 +0000
tree 9b15666df42bba7b0e71dbed0157cae1288fca2f
parent 7612fd4d5f477adc7365c98e01c82f374338423c
parent 83e9c24220f6d8f648acc75c9d6557c81fa79d06

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

Change-Id: If2c89f279bb50b9e703974de886622b13d13357c

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