diff options
| author | bsy@google.com <bsy@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 23:13:23 +0000 |
|---|---|---|
| committer | bsy@google.com <bsy@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-31 23:13:23 +0000 |
| commit | af39105464beb99cba340f601b2ec3c3268a239c (patch) | |
| tree | 491c7a6a09a7df58fe32efb61aafd9e85e7c7e2c | |
| parent | 51f25c2b78491b6244b326b0a0516af9da097f83 (diff) | |
| download | chromium_src-af39105464beb99cba340f601b2ec3c3268a239c.zip chromium_src-af39105464beb99cba340f601b2ec3c3268a239c.tar.gz chromium_src-af39105464beb99cba340f601b2ec3c3268a239c.tar.bz2 | |
Merge 164996 - Turn off sandbox::MITIGATION_HIGH_ENTROPY_ASLR for NACL64.
With MITIGATION_HIGH_ENTROPY_ASLR enabled, no NaCl modules get launched when Chromium runs on Windows 8. The fault appears to be somewhere in the nacl64.exe broker process, since adding a MessageBox(0,0,0,0) as the first line of wWinMain in nacl_exe_win_64.cc results in the following: when Chrome is launched with --no-sandbox, two pop-up windows appear when the first NaCl module is launched (once for the lazy launch of the broker, and once for the broker-launched process that runs the NaCl module); with Chrome is launched normally, without --no-sandbox, only one pop-up window appears: the broker process never spawns the 64-bit Nacl process.
crbug.com/158133 will be used to track progress towards figuring out the root cause and re-enabling MITIGATION_HIGH_ENTROPY.
BUG= 153368
TEST= Manually running existing NaCl modules (ssh, Don't Starve). We do not have Win8 builders or bots yet.
Review URL: https://codereview.chromium.org/11315019
TBR=bsy@google.com
Review URL: https://codereview.chromium.org/11368021
git-svn-id: svn://svn.chromium.org/chrome/branches/1312/src@165254 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/sandbox_policy.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index ef21f64..33ed514 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -748,12 +748,13 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, // TODO(jschuh): Make NaCl work with DEP and SEHOP. crbug.com/147752 sandbox::MitigationFlags mitigations = sandbox::MITIGATION_HEAP_TERMINATE | - sandbox::MITIGATION_BOTTOM_UP_ASLR | - sandbox::MITIGATION_HIGH_ENTROPY_ASLR; + sandbox::MITIGATION_BOTTOM_UP_ASLR; #if !defined(NACL_WIN64) + // TODO(jschuh,bsy): Make NaCl work with HIGH_ENTROPY_ASLR. crbug.com/158133 mitigations |= sandbox::MITIGATION_DEP | sandbox::MITIGATION_DEP_NO_ATL_THUNK | - sandbox::MITIGATION_SEHOP; + sandbox::MITIGATION_SEHOP | + sandbox::MITIGATION_HIGH_ENTROPY_ASLR; #if defined(NDEBUG) mitigations |= sandbox::MITIGATION_RELOCATE_IMAGE | sandbox::MITIGATION_RELOCATE_IMAGE_REQUIRED; |