aboutsummaryrefslogtreecommitdiff
path: root/src/client/linux
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/linux')
-rw-r--r--src/client/linux/handler/exception_handler.cc39
-rw-r--r--src/client/linux/handler/exception_handler.h1
2 files changed, 36 insertions, 4 deletions
diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
index 1fe7e83d..a9e2fca2 100644
--- a/src/client/linux/handler/exception_handler.cc
+++ b/src/client/linux/handler/exception_handler.cc
@@ -77,12 +77,13 @@
#include <sys/ucontext.h>
#include <sys/user.h>
#include <sys/wait.h>
+#include <ucontext.h>
#include <unistd.h>
#include "common/linux/linux_libc_support.h"
#include "common/linux/linux_syscall_support.h"
#include "common/linux/memory.h"
-#include "client/linux/minidump_writer//minidump_writer.h"
+#include "client/linux/minidump_writer/minidump_writer.h"
#include "common/linux/guid_creator.h"
// A wrapper for the tgkill syscall: send a signal to a specific thread.
@@ -274,6 +275,11 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
callback_context_))
return true;
+ return GenerateDump(&context);
+}
+
+// This function may run in a compromised context: see the top of the file.
+bool ExceptionHandler::GenerateDump(CrashContext *context) {
static const unsigned kChildStackSize = 8000;
PageAllocator allocator;
uint8_t* stack = (uint8_t*) allocator.Alloc(kChildStackSize);
@@ -286,8 +292,8 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
ThreadArgument thread_arg;
thread_arg.handler = this;
thread_arg.pid = getpid();
- thread_arg.context = &context;
- thread_arg.context_size = sizeof(context);
+ thread_arg.context = context;
+ thread_arg.context_size = sizeof(*context);
const pid_t child = sys_clone(
ThreadEntry, stack, CLONE_FILES | CLONE_FS | CLONE_UNTRACED,
@@ -298,7 +304,7 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
} while (r == -1 && errno == EINTR);
if (r == -1) {
- static const char msg[] = "ExceptionHandler::HandleSignal: waitpid failed:";
+ static const char msg[] = "ExceptionHandler::GenerateDump waitpid failed:";
sys_write(2, msg, sizeof(msg) - 1);
sys_write(2, strerror(errno), strlen(strerror(errno)));
sys_write(2, "\n", 1);
@@ -321,4 +327,29 @@ bool ExceptionHandler::DoDump(pid_t crashing_process, const void* context,
next_minidump_path_c_, crashing_process, context, context_size);
}
+// static
+bool ExceptionHandler::WriteMinidump(const std::string &dump_path,
+ MinidumpCallback callback,
+ void* callback_context) {
+ ExceptionHandler eh(dump_path, NULL, callback, callback_context, false);
+ return eh.WriteMinidump();
+}
+
+bool ExceptionHandler::WriteMinidump() {
+ // Allow ourselves to be dumped.
+ sys_prctl(PR_SET_DUMPABLE, 1);
+
+ CrashContext context;
+ int getcontext_result = getcontext(&context.context);
+ if (getcontext_result)
+ return false;
+ memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+ sizeof(context.float_state));
+ context.tid = sys_gettid();
+
+ bool success = GenerateDump(&context);
+ UpdateNextID();
+ return success;
+}
+
} // namespace google_breakpad
diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h
index b579a6a9..34ce5e19 100644
--- a/src/client/linux/handler/exception_handler.h
+++ b/src/client/linux/handler/exception_handler.h
@@ -153,6 +153,7 @@ class ExceptionHandler {
bool InstallHandlers();
void UninstallHandlers();
void PreresolveSymbols();
+ bool GenerateDump(CrashContext *context);
void UpdateNextID();
static void SignalHandler(int sig, siginfo_t* info, void* uc);