NonSFI NaCl: Plumb Exception IRT enough for breakpad.

components/nacl/loader/nonsfi/nonsfi_main.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 "components/nacl/loader/nonsfi/nonsfi_main.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/nacl/loader/nonsfi/elf_loader.h"
+#include "components/nacl/loader/nonsfi/irt_exception_handling.h"
 #include "components/nacl/loader/nonsfi/irt_interfaces.h"
 #include "native_client/src/include/elf_auxv.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/public/secure_service.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 #include "native_client/src/trusted/desc/nrd_all_modules.h"
 #include "native_client/src/trusted/desc/nrd_xfer.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
+#include "native_client/src/trusted/service_runtime/nacl_signal.h"
 
 namespace nacl {
 namespace nonsfi {
 namespace {
 
 typedef void (*EntryPointType)(uintptr_t*);
 
 class PluginMainDelegate : public base::PlatformThread::Delegate {
  public:
   explicit PluginMainDelegate(EntryPointType entry_point)
@@ skipping 138 matching lines @@
     LOG(ERROR) << "ServiceAccept: Failed to accept " << status;
     return;
   }
 
   NaClSrpcServerLoop(connected_desc, kNonSfiServiceHandlers, NULL);
 }
 
 }  // namespace
 
 void MainStart(NaClHandle imc_bootstrap_handle) {
+  // TODO(uekawa): Do I need to move it before InitializeBPFSandbox?
+  InitializeSignalHandler();

[Junichi Uekawa, 2014/04/14 22:51:04]

I'm not too sure when I need to initialize the handler, it seems like
InitializeBPFSandbox happens early (and I'm not quite sure sigaction succeeds
here).

[hamaji, 2014/04/15 15:23:35]

As chatted, this won't succeed after seccomp-bpf filter is landed. I think you
need call this in BecomeNaClLoader (nacl_helper_linux.cc).

[Junichi Uekawa, 2014/04/17 07:54:56]

I've moved it around.

+
   NaClSrpcModuleInit();
 
   struct NaClDesc* secure_pair[2] = { NULL, NULL };
   struct NaClDesc* pair[2] = { NULL, NULL };
   CreateSecureSocketPair(secure_pair, pair);
   ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> secure_port(secure_pair[0]);
   ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> secure_address(
        secure_pair[1]);
   ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> service_port(pair[0]);
   ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> service_address(pair[1]);
 
   ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> channel(
        SetUpBootstrapChannel(imc_bootstrap_handle,
                              secure_address.get(), service_address.get()));
   if (!channel) {
     LOG(ERROR) << "MainStart: Failed to set up bootstrap channel.";
     return;
   }
 
   // Start the SRPC server loop.
   ServiceAccept(secure_port.get());
 }
 
 }  // namespace nonsfi
 }  // namespace nacl