summaryrefslogtreecommitdiffstats
path: root/sandbox/win
diff options
context:
space:
mode:
authorshrikant <shrikant@chromium.org>2015-04-18 16:48:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-18 23:48:54 +0000
commit790be872f460ead8d7ca21c490077dab0a6d21ac (patch)
treec4c75b87124c80eaf395cb45705daad665cec6ac /sandbox/win
parent41026375ea9cf32478351f963389bb76f21dd564 (diff)
downloadchromium_src-790be872f460ead8d7ca21c490077dab0a6d21ac.zip
chromium_src-790be872f460ead8d7ca21c490077dab0a6d21ac.tar.gz
chromium_src-790be872f460ead8d7ca21c490077dab0a6d21ac.tar.bz2
Revert of Adding checks in sandbox code to get some data on AppContainer based CreateProcess failures. (patchset #2 id:20001 of https://codereview.chromium.org/1093443002/)
Reason for revert: Collected dumps, reverting. Original issue's description: > Adding checks in sandbox code to get some data on AppContainer based CreateProcess failures. > Due to limited debugging options, given it doesn't repro locally, adding some checks in sandbox code to gather more data. > > BUG=467920 > R=jschuh@chromium.org,cpu@chromium.org > > Committed: https://crrev.com/cb0da85dcf65824f96233ed77fd04d99b4c031cb > Cr-Commit-Position: refs/heads/master@{#325663} TBR=cpu@chromium.org,jschuh@chromium.org,wfh@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=467920 Review URL: https://codereview.chromium.org/1057083006 Cr-Commit-Position: refs/heads/master@{#325793}
Diffstat (limited to 'sandbox/win')
-rw-r--r--sandbox/win/src/target_process.cc34
1 files changed, 0 insertions, 34 deletions
diff --git a/sandbox/win/src/target_process.cc b/sandbox/win/src/target_process.cc
index 2af8917..e0284c3 100644
--- a/sandbox/win/src/target_process.cc
+++ b/sandbox/win/src/target_process.cc
@@ -5,8 +5,6 @@
#include "sandbox/win/src/target_process.h"
#include "base/basictypes.h"
-#include "base/debug/alias.h"
-#include "base/debug/dump_without_crashing.h"
#include "base/memory/scoped_ptr.h"
#include "base/win/pe_image.h"
#include "base/win/startup_information.h"
@@ -159,10 +157,6 @@ DWORD TargetProcess::Create(const wchar_t* exe_path,
NULL, // Use current directory of the caller.
startup_info.startup_info(),
&temp_process_info)) {
- // TODO(shrikant): Remove following code once we gather some dumps for
- // debugging appcontainer related failures (crbug.com/467920).
- base::debug::Alias(exe_path);
- base::debug::DumpWithoutCrashing();
return ::GetLastError();
}
} else {
@@ -188,12 +182,6 @@ DWORD TargetProcess::Create(const wchar_t* exe_path,
// Assign the suspended target to the windows job object.
if (!::AssignProcessToJobObject(job_, process_info.process_handle())) {
win_result = ::GetLastError();
- if (set_lockdown_token_after_create) {
- // TODO(shrikant): Remove this code once we gather some dumps for
- // debugging appcontainer related failures (crbug.com/467920).
- base::debug::Alias(&win_result);
- base::debug::DumpWithoutCrashing();
- }
::TerminateProcess(process_info.process_handle(), 0);
return win_result;
}
@@ -206,12 +194,6 @@ DWORD TargetProcess::Create(const wchar_t* exe_path,
HANDLE temp_thread = process_info.thread_handle();
if (!::SetThreadToken(&temp_thread, initial_token_.Get())) {
win_result = ::GetLastError();
- if (set_lockdown_token_after_create) {
- // TODO(shrikant): Remove this code once we gather some dumps for
- // debugging appcontainer related failures (crbug.com/467920).
- base::debug::Alias(&win_result);
- base::debug::DumpWithoutCrashing();
- }
// It might be a security breach if we let the target run outside the job
// so kill it before it causes damage.
::TerminateProcess(process_info.process_handle(), 0);
@@ -235,10 +217,6 @@ DWORD TargetProcess::Create(const wchar_t* exe_path,
sizeof(process_access_token));
if (!NT_SUCCESS(status)) {
win_result = ::GetLastError();
- // TODO(shrikant): Remove this code once we gather some dumps for
- // debugging appcontainer related failures (crbug.com/467920).
- base::debug::Alias(&win_result);
- base::debug::DumpWithoutCrashing();
::TerminateProcess(process_info.process_handle(), 0); // exit code
return win_result;
}
@@ -248,12 +226,6 @@ DWORD TargetProcess::Create(const wchar_t* exe_path,
context.ContextFlags = CONTEXT_ALL;
if (!::GetThreadContext(process_info.thread_handle(), &context)) {
win_result = ::GetLastError();
- if (set_lockdown_token_after_create) {
- // TODO(shrikant): Remove this code once we gather some dumps for
- // debugging appcontainer related failures (crbug.com/467920).
- base::debug::Alias(&win_result);
- base::debug::DumpWithoutCrashing();
- }
::TerminateProcess(process_info.process_handle(), 0);
return win_result;
}
@@ -270,12 +242,6 @@ DWORD TargetProcess::Create(const wchar_t* exe_path,
if (!target_info->DuplicateFrom(process_info)) {
win_result = ::GetLastError(); // This may or may not be correct.
- if (set_lockdown_token_after_create) {
- // TODO(shrikant): Remove this code once we gather some dumps for
- // debugging appcontainer related failures (crbug.com/467920).
- base::debug::Alias(&win_result);
- base::debug::DumpWithoutCrashing();
- }
::TerminateProcess(process_info.process_handle(), 0);
return win_result;
}