diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 16:06:00 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 16:06:00 +0000 |
| commit | 0b51e64be2b28657fd2642c10ac24b7ba4b3cb88 (patch) | |
| tree | 24d71ca4d7f5d2f43a7393e7bccc171f9f9595e3 /sandbox | |
| parent | 9573aad709cc3ffef296be9795eb117f975936ae (diff) | |
| download | chromium_src-0b51e64be2b28657fd2642c10ac24b7ba4b3cb88.zip chromium_src-0b51e64be2b28657fd2642c10ac24b7ba4b3cb88.tar.gz chromium_src-0b51e64be2b28657fd2642c10ac24b7ba4b3cb88.tar.bz2 | |
Revert 100328 - Prevent the renderer from dying if launched under App-V/SoftGrid.
We found a better workaround, so removing this one.
BUG=95888
Review URL: http://codereview.chromium.org/7857022
TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/7988006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/src/target_services.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sandbox/src/target_services.cc b/sandbox/src/target_services.cc index 32a452f..9b91a1c 100644 --- a/sandbox/src/target_services.cc +++ b/sandbox/src/target_services.cc @@ -71,12 +71,8 @@ ResultCode TargetServicesBase::Init() { // Failure here is a breach of security so the process is terminated. void TargetServicesBase::LowerToken() { - DWORD error_code = SetProcessIntegrityLevel(g_shared_delayed_integrity_level); - // Here we don't terminate the process if the error is ERROR_INVALID_HANDLE, - // this is because this error is not possible in normal circumstances, unless - // it is hooked by sftldr_wow64.dll, in which case we prefer to keep running. - // See http://crbug.com/95888. - if (ERROR_SUCCESS != error_code && ERROR_INVALID_HANDLE != error_code) + if (ERROR_SUCCESS != + SetProcessIntegrityLevel(g_shared_delayed_integrity_level)) ::TerminateProcess(::GetCurrentProcess(), SBOX_FATAL_INTEGRITY); process_state_.SetRevertedToSelf(); // If the client code as called RegOpenKey, advapi32.dll has cached some |