ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Let system_server truncate tombstones."

Browse source
This commit is contained in:
Josh Gao 2021-02-05 20:35:19 +00:00 • committed by Gerrit Code Review
commit 3a2f885ec6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debuggerd/tombstoned/tombstoned.cpp
View file

@ -143,13 +143,13 @@ class CrashQueue {
CrashArtifact result; CrashArtifact result;
std::optional<std::string> path; std::optional<std::string> path;
result.fd.reset(openat(dir_fd_, ".", O_WRONLY | O_APPEND | O_TMPFILE | O_CLOEXEC, 0640)); result.fd.reset(openat(dir_fd_, ".", O_WRONLY | O_APPEND | O_TMPFILE | O_CLOEXEC, 0660));
if (result.fd == -1) { if (result.fd == -1) {
// We might not have O_TMPFILE. Try creating with an arbitrary filename instead. // We might not have O_TMPFILE. Try creating with an arbitrary filename instead.
static size_t counter = 0; static size_t counter = 0;
std::string tmp_filename = StringPrintf(".temporary%zu", counter++); std::string tmp_filename = StringPrintf(".temporary%zu", counter++);
result.fd.reset(openat(dir_fd_, tmp_filename.c_str(), result.fd.reset(openat(dir_fd_, tmp_filename.c_str(),
O_WRONLY | O_APPEND | O_CREAT | O_TRUNC | O_CLOEXEC, 0640)); O_WRONLY | O_APPEND | O_CREAT | O_TRUNC | O_CLOEXEC, 0660));
if (result.fd == -1) { if (result.fd == -1) {
PLOG(FATAL) << "failed to create temporary tombstone in " << dir_path_; PLOG(FATAL) << "failed to create temporary tombstone in " << dir_path_;
} }
@ -509,7 +509,7 @@ static void crash_completed_cb(evutil_socket_t sockfd, short ev, void* arg) {
} }
int main(int, char* []) { int main(int, char* []) {
umask(0137); umask(0117);
// Don't try to connect to ourselves if we crash. // Don't try to connect to ourselves if we crash.
struct sigaction action = {}; struct sigaction action = {};