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

Merge "Fsync directories before delete key"

Browse source
This commit is contained in:
Chris Fries 2019-03-14 15:19:20 +00:00 committed by Gerrit Code Review
commit 7573874d3f
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
KeyStorage.cpp
View file

@ -224,6 +224,10 @@ static KeymasterOperation begin(Keymaster& keymaster, const std::string& dir,
PLOG(ERROR) << "Unable to move upgraded key to location: " << kmKeyPath;
return KeymasterOperation();
}
if (!android::vold::FsyncDirectory(dir)) {
LOG(ERROR) << "Key dir sync failed: " << dir;
return KeymasterOperation();
}
if (!keymaster.deleteKey(kmKey)) {
LOG(ERROR) << "Key deletion failed during upgrade, continuing anyway: " << dir;
}