commit 149f8d07547a9f0df26b3797948c032d4c333134
author Steven Moreland <smoreland@google.com> Fri Sep 06 14:55:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 06 14:55:27 2019 -0700
tree 7fb5a322927a862efde77948b6f94382850688c9
parent 33658d3c27834c05c381fce55e30acea73b9c81b
parent e3b772e0f7653a045bd29197c8b8f3b5bf2111c4

Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1
am: e3b772e0f7

Change-Id: I85611b0fb0615505d06f447e46083ed2f214e8e4

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