commit 56e89ade33c649412999d2663acc2f12ca9873a8
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 06 22:26:16 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 06 22:26:17 2017 +0000
tree b16b180eac508047d38ab0d1ede638e69e4ca18b
parent 514e0aa2e245c26aeb5520436125505c230c649f
parent 55f79a5953e81c6b7ae56081e3c2fd2711a47dbc

Merge changes Ib69a206f,If57cc175

* changes:
  tombstoned: turn off signal handlers.
  tombstoned: create tombstones with 0640 permissions.

debuggerd/tombstoned/tombstoned.cpp

diff --git a/debuggerd/tombstoned/tombstoned.cpp b/debuggerd/tombstoned/tombstoned.cpp
index 8705ece..6754508 100644
--- a/debuggerd/tombstoned/tombstoned.cpp
+++ b/debuggerd/tombstoned/tombstoned.cpp
@@ -34,6 +34,7 @@
 #include <android-base/unique_fd.h>
 #include <cutils/sockets.h>
 
+#include "debuggerd/handler.h"
 #include "debuggerd/protocol.h"
 #include "debuggerd/util.h"
 
@@ -116,7 +117,7 @@
   }
 
   result.reset(
-    openat(tombstone_directory_fd, buf, O_CREAT | O_EXCL | O_WRONLY | O_APPEND | O_CLOEXEC, 0700));
+    openat(tombstone_directory_fd, buf, O_CREAT | O_EXCL | O_WRONLY | O_APPEND | O_CLOEXEC, 0640));
   if (result == -1) {
     PLOG(FATAL) << "failed to create tombstone at " << kTombstoneDirectory << buf;
   }
@@ -254,6 +255,16 @@
 }
 
 int main(int, char* []) {
+  umask(0137);
+
+  // Don't try to connect to ourselves if we crash.
+  struct sigaction action = {};
+  action.sa_handler = [](int signal) {
+    LOG(ERROR) << "received fatal signal " << signal;
+    _exit(1);
+  };
+  debuggerd_register_handlers(&action);
+
   tombstone_directory_fd = open(kTombstoneDirectory, O_DIRECTORY | O_RDONLY | O_CLOEXEC);
   if (tombstone_directory_fd == -1) {
     PLOG(FATAL) << "failed to open tombstone directory";