summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Krahn <dkrahn@google.com>2015-12-02 19:32:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-12-02 19:32:29 +0000
commit7d4903c2a8653c80dbb57257748e8398c7d5f555 (patch)
tree4b9ba221914d7f591615c44af554cab22396ad5f
parent2da8ff25e7c88c78e8a9db8de9686c92817f0992 (diff)
parent073ef82ad13d48cdc9c04425a39b0a4c1f2657db (diff)
downloadtpm-7d4903c2a8653c80dbb57257748e8398c7d5f555.tar.gz
Merge "attestation: Add logging on file read failures."
-rw-r--r--attestation/server/database_impl.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/attestation/server/database_impl.cc b/attestation/server/database_impl.cc
index 48cdfe5..2f2c150 100644
--- a/attestation/server/database_impl.cc
+++ b/attestation/server/database_impl.cc
@@ -101,9 +101,14 @@ bool DatabaseImpl::Read(std::string* data) {
int permissions = 0;
if (base::GetPosixFilePermissions(path, &permissions) &&
(permissions & kMask) != 0) {
+ LOG(WARNING) << "Attempting to fix permissions on attestation database.";
base::SetPosixFilePermissions(path, permissions & ~kMask);
}
- return base::ReadFileToString(path, data);
+ if (!base::ReadFileToString(path, data)) {
+ PLOG(ERROR) << "Failed to read attestation database";
+ return false;
+ }
+ return true;
}
bool DatabaseImpl::Write(const std::string& data) {