diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 16:01:21 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 16:01:21 +0000 |
| commit | 7a3a69a2c0f5acb6c16f104399aecc0e85474f28 (patch) | |
| tree | 3acd08f19dafe8150d045e877182cd474356edeb /content/app | |
| parent | 58c293847945c02725e211b1625722127ace14a5 (diff) | |
| download | chromium_src-7a3a69a2c0f5acb6c16f104399aecc0e85474f28.zip chromium_src-7a3a69a2c0f5acb6c16f104399aecc0e85474f28.tar.gz chromium_src-7a3a69a2c0f5acb6c16f104399aecc0e85474f28.tar.bz2 | |
Revert 156550 - Add sandbox support for Windows process mitigations
BUG=147752
Review URL: https://codereview.chromium.org/10690058
TBR=jschuh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10907217
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/startup_helper_win.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/content/app/startup_helper_win.cc b/content/app/startup_helper_win.cc index 17fd323..9ead36d 100644 --- a/content/app/startup_helper_win.cc +++ b/content/app/startup_helper_win.cc @@ -10,7 +10,7 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/win/windows_version.h" -#include "sandbox/win/src/process_mitigations.h" +#include "sandbox/win/src/dep.h" #include "sandbox/win/src/sandbox_factory.h" namespace { @@ -37,13 +37,12 @@ namespace content { void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* info) { info->broker_services = sandbox::SandboxFactory::GetBrokerServices(); - if (!info->broker_services) { + if (!info->broker_services) info->target_services = sandbox::SandboxFactory::GetTargetServices(); - } else { - // Ensure the proper mitigations are enforced for the browser process. - sandbox::ApplyProcessMitigationsToCurrentProcess( - sandbox::MITIGATION_DEP | - sandbox::MITIGATION_DEP_NO_ATL_THUNK); + + if (base::win::GetVersion() < base::win::VERSION_VISTA) { + // Enforces strong DEP support. Vista uses the NXCOMPAT flag in the exe. + sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED); } } |