Enabling 64-bit mojo shell to launch 32-bit child to handle nonsfi content.

shell/out_of_process_native_runner.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "shell/out_of_process_native_runner.h"
 
+#include <elf.h>
+#include <string>
+
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/strings/string_util.h"
 #include "shell/child_controller.mojom.h"
 #include "shell/child_process_host.h"
 #include "shell/in_process_native_runner.h"
 
 namespace shell {
 
 OutOfProcessNativeRunner::OutOfProcessNativeRunner(Context* context)
     : context_(context) {
 }
 
 OutOfProcessNativeRunner::~OutOfProcessNativeRunner() {
   if (child_process_host_) {
     // TODO(vtl): Race condition: If |ChildProcessHost::DidStart()| hasn't been
     // called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we may
     // not have a child process to wait on.) Probably we should fix |Join()|.
     child_process_host_->Join();
   }
 }
 
+// Determines if content handler must be run as 32 bit application
+// based on elf header. Returns false on error.
+bool Require32Bit(const base::FilePath& app_path) {

[Mark Seaborn, 2015/09/15 22:25:43]

This could go in an anon namespace.

[Sean Klein, 2015/09/15 22:56:05]

Done.

+#if defined(ARCH_CPU_32_BITS)

[Mark Seaborn, 2015/09/15 22:25:43]

You could use "if (sizeof(void *) == 4)".  This way, both branches get
compile-tested.

if() is often preferable to #if:
http://lackingrhoticity.blogspot.com/2015/01/conditionalising-c-ifdef-vs-if.html

If you do use ARCH_*, though, you should make sure to #include
"build/build_config.h".

Same in other file too.

[Sean Klein, 2015/09/15 22:56:05]

Using "sizeof(void *) == 4", along with a comment.

+  return true;
+#else
+  bool require_32_bit = false;
+  char data[EI_NIDENT];
+  // Read e_ident from the elf file
+  if (EI_NIDENT != ReadFile(app_path, data, sizeof(data)))

[Mark Seaborn, 2015/09/15 22:25:43]

Nit: Also "EI_NIDENT" -> "sizeof(data)" (as before)

[Sean Klein, 2015/09/15 22:56:05]

Done.

+    return false;
+  // Check the magic elf number
+  if (memcmp(data, ELFMAG, SELFMAG))
+    return false;
+  // Identify the architecture required
+  if (data[EI_CLASS] == ELFCLASS32)

[Mark Seaborn, 2015/09/15 22:25:43]

Can simplify to:
return data[EI_CLASS] == ELFCLASS32;

[Sean Klein, 2015/09/15 22:56:05]

Done.

+    require_32_bit = true;
+  return require_32_bit;
+#endif
+}
+
 void OutOfProcessNativeRunner::Start(
     const base::FilePath& app_path,
     mojo::InterfaceRequest<mojo::Application> application_request,
     const base::Closure& app_completed_callback) {
   app_path_ = app_path;
 
   DCHECK(app_completed_callback_.is_null());
   app_completed_callback_ = app_completed_callback;
 
   child_process_host_.reset(new ChildProcessHost(context_));
-  child_process_host_->Start();
+  child_process_host_->Start(Require32Bit(app_path));
 
   // TODO(vtl): |app_path.AsUTF8Unsafe()| is unsafe.
   child_process_host_->StartApp(
       app_path.AsUTF8Unsafe(), application_request.Pass(),
       base::Bind(&OutOfProcessNativeRunner::AppCompleted,
                  base::Unretained(this)));
 }
 
 void OutOfProcessNativeRunner::AppCompleted(int32_t result) {
   DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")";
@@ skipping 10 matching lines @@
 
 scoped_ptr<NativeRunner> OutOfProcessNativeRunnerFactory::Create(
     const Options& options) {
   if (options.force_in_process)
     return make_scoped_ptr(new InProcessNativeRunner(context_));
 
   return make_scoped_ptr(new OutOfProcessNativeRunner(context_));
 }
 
 }  // namespace shell