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

1 files changed, 29 insertions, 3 deletions

diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index a1d635e..9c680df 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -764,11 +764,37 @@ int ChromeMain(int argc, char** argv) {
 
   // The helper's Info.plist marks it as a background only app.
   if (base::mac::IsBackgroundOnlyProcess()) {
-    CHECK(command_line.HasSwitch(switches::kProcessType))
+    CHECK(command_line.HasSwitch(switches::kProcessType) &&
+          !process_type.empty())
         << "Helper application requires --type.";
+
+    // In addition, some helper flavors only work with certain process types.
+    FilePath executable;
+    if (PathService::Get(base::FILE_EXE, &executable) &&
+        executable.value().size() >= 3) {
+      std::string last_three =
+          executable.value().substr(executable.value().size() - 3);
+
+      if (last_three == " EH") {
+        CHECK_EQ(switches::kPluginProcess, process_type)
+            << "Executable-heap process requires --type="
+            << switches::kPluginProcess << ", saw " << process_type;
+      } else if (last_three == " NP") {
+        CHECK_EQ(switches::kNaClLoaderProcess, process_type)
+            << "Non-PIE process requires --type="
+            << switches::kNaClLoaderProcess << ", saw " << process_type;
+      } else {
+        CHECK(process_type != switches::kPluginProcess &&
+              process_type != switches::kNaClLoaderProcess)
+            << "Non-executable-heap PIE process is intolerant of --type="
+            << switches::kPluginProcess << " and "
+            << switches::kNaClLoaderProcess << ", saw " << process_type;
+      }
+    }
   } else {
-    CHECK(!command_line.HasSwitch(switches::kProcessType))
-        << "Main application forbids --type, saw \"" << process_type << "\".";
+    CHECK(!command_line.HasSwitch(switches::kProcessType) &&
+          process_type.empty())
+        << "Main application forbids --type, saw " << process_type;
   }
 
   if (IsCrashReporterEnabled())