commit 0b895c13bcf5839f3c001e19cc976038df536978
author Shawn Willden <swillden@google.com> Thu Sep 12 09:29:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 12 09:29:15 2019 -0700
tree b1491ee2e5a5bfe50ce30dd556bb5616f6072f69
parent 69a1fd86d359fa14d4add9aff910663030685ca6
parent aae52f4816097b23f1ab0455bc598e246dde460f

Merge "Request rollback resistance for FBE keys."
am: aae52f4816

Change-Id: Ie2143da9b9b1d2e76faa958d1a04d2be6b0045e7

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