diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 17:46:10 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 17:46:10 +0000 |
| commit | 914bc73938a428fb7315643277068056fc723fae (patch) | |
| tree | 08c5818070a0c189ff8fc0f9b814db29777b14ac /content/common/sandbox_policy.cc | |
| parent | 665594887af9746280a3ea281ac1676b2793d3c3 (diff) | |
| download | chromium_src-914bc73938a428fb7315643277068056fc723fae.zip chromium_src-914bc73938a428fb7315643277068056fc723fae.tar.gz chromium_src-914bc73938a428fb7315643277068056fc723fae.tar.bz2 | |
Revert 156315 - Add sandbox support for Windows process mitigations
BUG=147752
Review URL: https://chromiumcodereview.appspot.com/10690058
TBR=jschuh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10918197
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/sandbox_policy.cc')
| -rw-r--r-- | content/common/sandbox_policy.cc | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index 8ad0a5d..b7eba46 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -25,7 +25,6 @@ #include "content/public/common/content_switches.h" #include "content/public/common/process_type.h" #include "content/public/common/sandbox_init.h" -#include "sandbox/win/src/process_mitigations.h" #include "sandbox/win/src/sandbox.h" #include "sandbox/win/src/sandbox_nt_util.h" #include "sandbox/win/src/win_utils.h" @@ -728,28 +727,6 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, return process; } - uint64 mitigations = MITIGATION_RELOCATE_IMAGE | - MITIGATION_RELOCATE_IMAGE_REQUIRED | - MITIGATION_HEAP_TERMINATE | - MITIGATION_BOTTOM_UP_ASLR | - MITIGATION_HIGH_ENTROPY_ASLR; - // TODO(jschuh): Make NaCl work with DEP and SEHOP policy. - if (type != content::PROCESS_TYPE_NACL_LOADER) { - mitigations |= MITIGATION_DEP | - MITIGATION_DEP_NO_ATL_THUNK | - MITIGATION_SEHOP; - } - if (policy->SetProcessMitigations(mitigations) != sandbox::SBOX_ALL_OK) - return 0; - - mitigations = MITIGATION_STRICT_HANDLE_CHECKS | - MITIGATION_EXTENSION_DLL_DISABLE | - MITIGATION_DLL_SEARCH_ORDER; - if (policy->SetDelayedProcessMitigations(mitigations) != - sandbox::SBOX_ALL_OK) { - return 0; - } - if (type == content::PROCESS_TYPE_PLUGIN) { AddGenericDllEvictionPolicy(policy); AddPluginDllEvictionPolicy(policy); |