commit be4ff998ac34900f1f2f0a8663dfcc931e8cf7ac
author Xin Li <delphij@google.com> Sun Oct 27 04:44:29 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Oct 27 04:44:29 2019 +0000
tree 61b7ce20c5a3e8866342b3054f3a030ce1e88c70
parent 7e43d985cfe73c2adc38ddfb52a56edd894dbe6f
parent 8a9454c35c0e95e04381f0ee33124489328fa2e0

Merge "Merge Coral/Flame into AOSP master"

secdiscard.cpp

diff --git a/secdiscard.cpp b/secdiscard.cpp
index 0ff05d6..4659eed 100644
--- a/secdiscard.cpp
+++ b/secdiscard.cpp
@@ -147,6 +147,10 @@
             if (!overwrite_with_zeros(fs_fd.get(), range[0], range[1])) return false;
         }
     }
+    // Should wait for overwrites completion. Otherwise after unlink(),
+    // filesystem can allocate these blocks and IO can be reordered, resulting
+    // in making zero blocks to filesystem blocks.
+    fsync(fs_fd.get());
     return true;
 }