tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

EncryptInplace: fsync cryptofd before reporting success

Browse source 
fsync() the cryptofd when done writing to it.  Without this, any
remaining dirty pages in the crypto_blkdev's page cache (which there
might be a lot of, even as much as all the data that was written) won't
be flushed to disk until the cryptofd is closed, which ignores I/O
errors and is also after we already reported 100% completion.

There wasn't an fsync() in the original version either, so we've been
getting by without it, but it seems it should be there.

Change-Id: Idd1be3ae67ce96ecf3946b9efb9fc57414f5805a
This commit is contained in:
Eric Biggers 2020-11-04 18:38:38 -08:00
parent 91e4f1dd76
commit 1ba8865fec
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
EncryptInplace.cpp
View file

@ -345,6 +345,11 @@ bool InPlaceEncrypter::EncryptInPlace(const std::string& crypto_blkdev,
if (success) success &= EncryptPendingData(); if (success) success &= EncryptPendingData();
if (success && fsync(cryptofd_) != 0) {
PLOG(ERROR) << "Error syncing " << crypto_blkdev_;
success = false;
}
if (!success) { if (!success) {
LOG(ERROR) << "In-place encryption of " << DescribeFilesystem() << " failed"; LOG(ERROR) << "In-place encryption of " << DescribeFilesystem() << " failed";
return false; return false;