Commit 31378ffa authored by Joshua Peraza's avatar Joshua Peraza Committed by Commit Bot

Update Crashpad to a8d66ae7839a59d104b35ec6eb31f95cddd1813c

93f8aa8df989 posix: fix parameter name in signals test
a8d66ae7839a linux: don't set ptracer if yama doesn't exist

Change-Id: I1786c96dff5a0768dda8a7c32b274f3189e525bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1906899
Commit-Queue: Mark Mentovai <mark@chromium.org>
Auto-Submit: Joshua Peraza <jperaza@chromium.org>
Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714651}
parent d7bbde90
...@@ -2,7 +2,7 @@ Name: Crashpad ...@@ -2,7 +2,7 @@ Name: Crashpad
Short Name: crashpad Short Name: crashpad
URL: https://crashpad.chromium.org/ URL: https://crashpad.chromium.org/
Version: unknown Version: unknown
Revision: bd1aa246ca185519dea0af1c5ca11656c41b0c80 Revision: a8d66ae7839a59d104b35ec6eb31f95cddd1813c
License: Apache 2.0 License: Apache 2.0
License File: crashpad/LICENSE License File: crashpad/LICENSE
Security Critical: yes Security Critical: yes
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "client/client_argv_handling.h" #include "client/client_argv_handling.h"
#include "third_party/lss/lss.h" #include "third_party/lss/lss.h"
#include "util/file/file_io.h" #include "util/file/file_io.h"
#include "util/file/filesystem.h"
#include "util/linux/exception_handler_client.h" #include "util/linux/exception_handler_client.h"
#include "util/linux/exception_information.h" #include "util/linux/exception_information.h"
#include "util/linux/scoped_pr_set_dumpable.h" #include "util/linux/scoped_pr_set_dumpable.h"
...@@ -380,9 +381,14 @@ bool CrashpadClient::StartHandler( ...@@ -380,9 +381,14 @@ bool CrashpadClient::StartHandler(
return false; return false;
} }
pid_t handler_pid = -1;
if (!IsRegularFile(base::FilePath("/proc/sys/kernel/yama/ptrace_scope"))) {
handler_pid = 0;
}
auto signal_handler = RequestCrashDumpHandler::Get(); auto signal_handler = RequestCrashDumpHandler::Get();
return signal_handler->Initialize( return signal_handler->Initialize(
std::move(client_sock), -1, &unhandled_signals_); std::move(client_sock), handler_pid, &unhandled_signals_);
} }
#if defined(OS_ANDROID) || defined(OS_LINUX) #if defined(OS_ANDROID) || defined(OS_LINUX)
......
...@@ -259,10 +259,10 @@ class SignalsTest : public Multiprocess { ...@@ -259,10 +259,10 @@ class SignalsTest : public Multiprocess {
bool (*install_handlers)(Signals::Handler, int, Signals::OldActions*); bool (*install_handlers)(Signals::Handler, int, Signals::OldActions*);
if (Signals::IsCrashSignal(sig_)) { if (Signals::IsCrashSignal(sig_)) {
install_handlers = [](Signals::Handler handler, install_handlers = [](Signals::Handler handler,
int sig, int flags,
Signals::OldActions* old_actions) { Signals::OldActions* old_actions) {
return Signals::InstallCrashHandlers( return Signals::InstallCrashHandlers(
handler, sig, old_actions, nullptr); handler, flags, old_actions, nullptr);
}; };
} else if (Signals::IsTerminateSignal(sig_)) { } else if (Signals::IsTerminateSignal(sig_)) {
install_handlers = Signals::InstallTerminateHandlers; install_handlers = Signals::InstallTerminateHandlers;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment