mirrors-yuzu-emu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad synced 2024-11-23 21:34:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Microdump writer: stop using new/malloc in compromised context

Browse source 
A recent change in the client-side microdump write (r1404) ended up
introducing a call to new() to instantiate the line buffer that
microdump uses to dump its lines. new/malloc is a luxury we cannot
afford in a compromised context.
This change switches the line buffer to be backed by the dumper
page allocator, which on Linux/Android ends up requesting pages
via mmap.
Also, the microdump write bails out without crashing if the page
allocator failed (crash during severe OOM).

BUG=640

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1432 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
primiano@chromium.org 2015-03-10 20:06:04 +00:00
parent bbd478ae73
commit 9208fbc224
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/client/linux/microdump_writer/microdump_writer.cc
View file

@ -41,7 +41,6 @@
#include "client/linux/log/log.h" #include "client/linux/log/log.h"
#include "client/linux/minidump_writer/linux_ptrace_dumper.h" #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
#include "common/linux/linux_libc_support.h" #include "common/linux/linux_libc_support.h"
#include "common/scoped_ptr.h"
namespace { namespace {
@ -51,7 +50,6 @@ using google_breakpad::LinuxPtraceDumper;
using google_breakpad::MappingInfo; using google_breakpad::MappingInfo;
using google_breakpad::MappingList; using google_breakpad::MappingList;
using google_breakpad::RawContextCPU; using google_breakpad::RawContextCPU;
using google_breakpad::scoped_array;
using google_breakpad::SeccompUnwinder; using google_breakpad::SeccompUnwinder;
using google_breakpad::ThreadInfo; using google_breakpad::ThreadInfo;
using google_breakpad::UContextReader; using google_breakpad::UContextReader;
@ -69,14 +67,20 @@ class MicrodumpWriter {
#endif #endif
dumper_(dumper), dumper_(dumper),
mapping_list_(mappings), mapping_list_(mappings),
log_line_(new char[kLineBufferSize]) { log_line_(NULL) {
log_line_.get()[0] = '\0'; // Clear out the log line buffer. log_line_ = reinterpret_cast<char*>(Alloc(kLineBufferSize));
if (log_line_)
log_line_[0] = '\0'; // Clear out the log line buffer.
} }
~MicrodumpWriter() { dumper_->ThreadsResume(); } ~MicrodumpWriter() { dumper_->ThreadsResume(); }
bool Init() { bool Init() {
if (!dumper_->Init()) // In the exceptional case where the system was out of memory and there
// wasn't even room to allocate the line buffer, bail out. There is nothing
// useful we can possibly achieve without the ability to Log. At least let's
// try to not crash.
if (!dumper_->Init() || !log_line_)
return false; return false;
return dumper_->ThreadsSuspend(); return dumper_->ThreadsSuspend();
} }
@ -105,7 +109,7 @@ class MicrodumpWriter {
// Stages the given string in the current line buffer. // Stages the given string in the current line buffer.
void LogAppend(const char* str) { void LogAppend(const char* str) {
my_strlcat(log_line_.get(), str, kLineBufferSize); my_strlcat(log_line_, str, kLineBufferSize);
} }
// As above (required to take precedence over template specialization below). // As above (required to take precedence over template specialization below).
@ -135,8 +139,8 @@ class MicrodumpWriter {
// Writes out the current line buffer on the system log. // Writes out the current line buffer on the system log.
void LogCommitLine() { void LogCommitLine() {
LogLine(log_line_.get()); LogLine(log_line_);
my_strlcpy(log_line_.get(), "", kLineBufferSize); my_strlcpy(log_line_, "", kLineBufferSize);
} }
bool DumpOSInformation() { bool DumpOSInformation() {
@ -363,7 +367,7 @@ class MicrodumpWriter {
#endif #endif
LinuxDumper* dumper_; LinuxDumper* dumper_;
const MappingList& mapping_list_; const MappingList& mapping_list_;
scoped_array<char> log_line_; char* log_line_;
}; };
} // namespace } // namespace