Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Unified Diff: components/nacl/browser/nacl_process_host.cc

Issue 1312273002: NaCl: Re-enable ASLR for nacl-loader processes on Mac OS X (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/browser/nacl_process_host.cc
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 52a016f6b3e47adf08ea678c0f2451b92d792a5c..e5a507ffea418a7b7c579ef1a3915bb5c84b3ddd 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -596,15 +596,7 @@ bool NaClProcessHost::LaunchSelLdr() {
// Build command line for nacl.
-#if defined(OS_MACOSX)
- // The Native Client process needs to be able to allocate a 1GB contiguous
- // region to use as the client environment's virtual address space. ASLR
- // (PIE) interferes with this by making it possible that no gap large enough
- // to accomodate this request will exist in the child process' address
- // space. Disable PIE for NaCl processes. See http://crbug.com/90221 and
- // http://code.google.com/p/nativeclient/issues/detail?id=2043.
- int flags = ChildProcessHost::CHILD_NO_PIE;
-#elif defined(OS_LINUX)
+#if defined(OS_LINUX)
int flags = ChildProcessHost::CHILD_ALLOW_SELF;
#else
int flags = ChildProcessHost::CHILD_NORMAL;
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698