summaryrefslogtreecommitdiffstats
path: root/chrome/browser/service
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 03:33:36 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 03:33:36 +0000
commit8c40f3212b62b828f3cfbe151fb3ecd2294e44ca (patch)
treeea582d6c5b274418ff853eb67bc8bbbe2ed2d619 /chrome/browser/service
parent06ead8788ef8d9ea7e5db736d563a7fb25df059d (diff)
downloadchromium_src-8c40f3212b62b828f3cfbe151fb3ecd2294e44ca.zip
chromium_src-8c40f3212b62b828f3cfbe151fb3ecd2294e44ca.tar.gz
chromium_src-8c40f3212b62b828f3cfbe151fb3ecd2294e44ca.tar.bz2
Give plug-in processes an executable heap and disable PIE/ASLR for Native
Client loader processes. Some plug-ins depend on having an executable heap. They write code to data pages and attempt to execute it without calling mprotect to mark this code as executable. Native Client needs to allocate a contiguous 1GB of address space. ASLR may interfere with there being a "hole" this large in the address space by the time NaCl makes its request. Non-executable heaps are only available in 10.7 and later for 32-bit processes. PIE/ASLR was formerly disabled for all processes other than the browser process. This change reenables it for all processes other than the NaCl loader. PIE/ASLR is available on 10.5 and later, although the implementation is stronger in 10.7 than in earlier releases. This change results in two new helpers in addition to the existing Chromium Helper.app: Chromium Helper EH.app (for executable heaps) and Chromium Helper NP.app (for no PIE). libplugin_carbon_interpose.dylib moves out of the helper .app and directly into the versioned directory. The InfoPlist.strings have been removed from the helper app, but empty .lproj directories remain. BUG=90221, 93551 TEST=everything Review URL: http://codereview.chromium.org/7714018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service')
-rw-r--r--chrome/browser/service/service_process_control.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc
index 9557af2..40de028 100644
--- a/chrome/browser/service/service_process_control.cc
+++ b/chrome/browser/service/service_process_control.cc
@@ -118,7 +118,14 @@ void ServiceProcessControl::Launch(Task* success_task, Task* failure_task) {
// A service process should have a different mechanism for starting, but now
// we start it as if it is a child process.
- FilePath exe_path = ChildProcessHost::GetChildPath(true);
+
+#if defined(OS_LINUX)
+ int flags = ChildProcessHost::CHILD_ALLOW_SELF;
+#else
+ int flags = ChildProcessHost::CHILD_NORMAL;
+#endif
+
+ FilePath exe_path = ChildProcessHost::GetChildPath(flags);
if (exe_path.empty()) {
NOTREACHED() << "Unable to get service process binary name.";
}