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

am: 586a2dbf Change-Id: Iedd1c87c8a727b4ecb415d16a3fe14907f5206e0

Merge "Reduce chance of zero-length keystore files" am: 71251eec
am: 586a2dbf Change-Id: Iedd1c87c8a727b4ecb415d16a3fe14907f5206e0
57e65e2b · Jacob Abrams · android-build-merger · 87884b14 · 586a2dbf · 57e65e2b
Commit 57e65e2b authored 8 years ago by Jacob Abrams Committed by android-build-merger 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

keystore/keystore_utils.cpp keystore/keystore_utils.cpp +4 -0

No files found.
--- a/keystore/keystore_utils.cpp
+++ b/keystore/keystore_utils.cpp
@@ -51,6 +51,10 @@ size_t writeFully(int fd, uint8_t* data, size_t size) {
        data += n;
        remaining -= n;
    }
+    if (TEMP_FAILURE_RETRY(fsync(fd)) == -1) {
+        ALOGW("fsync failed: %s", strerror(errno));
+        return -1;
+    }
    return size;
 }