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

Vold: Add fsync in writeStringToFile() am: 701d05d32c

Browse source 
am: ee8170f2ac

Change-Id: I2ce9e9a6ea1969e1bf41ef6886dc4d27ee19f58a
This commit is contained in:
Wei Wang 2017-11-08 21:38:42 +00:00 committed by android-build-merger
commit a087947490
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
KeyStorage.cpp
View file

@ -35,6 +35,7 @@
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/unique_fd.h>
#include <cutils/properties.h> #include <cutils/properties.h>
@ -152,10 +153,29 @@ static bool readFileToString(const std::string& filename, std::string* result) {
} }
static bool writeStringToFile(const std::string& payload, const std::string& filename) { static bool writeStringToFile(const std::string& payload, const std::string& filename) {
if (!android::base::WriteStringToFile(payload, filename)) { android::base::unique_fd fd(TEMP_FAILURE_RETRY(
PLOG(ERROR) << "Failed to write to " << filename; open(filename.c_str(), O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC | O_CLOEXEC, 0666)));
if (fd == -1) {
PLOG(ERROR) << "Failed to open " << filename;
return false; return false;
} }
if (!android::base::WriteStringToFd(payload, fd)) {
PLOG(ERROR) << "Failed to write to " << filename;
unlink(filename.c_str());
return false;
}
// fsync as close won't guarantee flush data
// see close(2), fsync(2) and b/68901441
if (fsync(fd) == -1) {
if (errno == EROFS || errno == EINVAL) {
PLOG(WARNING) << "Skip fsync " << filename
<< " on a file system does not support synchronization";
} else {
PLOG(ERROR) << "Failed to fsync " << filename;
unlink(filename.c_str());
return false;
}
}
return true; return true;
} }