diff options
| author | ssid <ssid@chromium.org> | 2015-08-08 18:56:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-09 01:57:36 +0000 |
| commit | 106f089b0e23ebbe25fef13880d8ebe4902939e0 (patch) | |
| tree | b937187b275e19529bf6d352b8e70cd1d8d75bcb /base | |
| parent | 5c207cac73c835b5f362670d6b46333dfae1f4c4 (diff) | |
| download | chromium_src-106f089b0e23ebbe25fef13880d8ebe4902939e0.zip chromium_src-106f089b0e23ebbe25fef13880d8ebe4902939e0.tar.gz chromium_src-106f089b0e23ebbe25fef13880d8ebe4902939e0.tar.bz2 | |
[tracing] Disable memory maps dump provider for security reason
The memory maps should not be exposed to untrusted renderers. So, the
memory maps dump provider is disabled till the tracing infra is more
secure.
BUG=517906
Review URL: https://codereview.chromium.org/1275013005
Cr-Commit-Position: refs/heads/master@{#342549}
Diffstat (limited to 'base')
| -rw-r--r-- | base/trace_event/memory_dump_manager.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc index f76ac55..bafd121 100644 --- a/base/trace_event/memory_dump_manager.cc +++ b/base/trace_event/memory_dump_manager.cc @@ -119,7 +119,14 @@ void MemoryDumpManager::Initialize() { #endif #if defined(OS_LINUX) || defined(OS_ANDROID) - RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance()); + // The memory maps dump provider is currently disabled for security reasons + // and will be enabled once tracing is more secure (crbug.com/517906). + // It is still enabled for running benchmarks. + if (CommandLine::ForCurrentProcess()->HasSwitch( + "enable-memory-benchmarking")) { + RegisterDumpProvider(ProcessMemoryMapsDumpProvider::GetInstance()); + } + RegisterDumpProvider(MallocDumpProvider::GetInstance()); system_allocator_pool_name_ = MallocDumpProvider::kAllocatedObjects; #endif |