Non-SFI mode: Use dummy PID for NaCl's IPC channel on Linux platform.

ipc/ipc_channel_posix.cc

 // Copyright (c) 2012 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 "ipc/ipc_channel_posix.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
@@ skipping 158 matching lines @@
 #if defined(OS_ANDROID)
 // When we fork for simple tests on Android, we can't 'exec', so we need to
 // reset these entries manually to get the expected testing behavior.
 void Channel::NotifyProcessForkedForTesting() {
   PipeMap::GetInstance()->map_.clear();
 }
 #endif
 
 //------------------------------------------------------------------------------
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_NACL_NONSFI)
 int ChannelPosix::global_pid_ = 0;
-#endif  // OS_LINUX
+#endif  // defined(OS_LINUX) || defined(OS_NACL_NONSFI)
 
 ChannelPosix::ChannelPosix(const IPC::ChannelHandle& channel_handle,
                            Mode mode, Listener* listener)
     : ChannelReader(listener),
       mode_(mode),
       peer_pid_(base::kNullProcessId),
       is_blocked_on_write_(false),
       waiting_connect_(true),
       message_send_bytes_written_(0),
       pipe_name_(channel_handle.name),
@@ skipping 446 matching lines @@
   fds_to_close_.clear();
 #endif
 }
 
 // static
 bool ChannelPosix::IsNamedServerInitialized(
     const std::string& channel_id) {
   return base::PathExists(base::FilePath(channel_id));
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_NACL_NONSFI)
 // static
 void ChannelPosix::SetGlobalPid(int pid) {
   global_pid_ = pid;
 }
-#endif  // OS_LINUX
+#endif  // defined(OS_LINUX) || defined(OS_NACL_NONSFI)
 
 // Called by libevent when we can read from the pipe without blocking.
 void ChannelPosix::OnFileCanReadWithoutBlocking(int fd) {
   if (fd == server_listen_pipe_.get()) {
 #if defined(__native_client_nonsfi__)
     LOG(FATAL)
         << "IPC channels in nacl_helper_nonsfi should not be SERVER mode.";
 #else
     int new_pipe = 0;
     if (!ServerAcceptConnection(server_listen_pipe_.get(), &new_pipe) ||
@@ skipping 100 matching lines @@
     Close();
     if (AcceptsConnections()) {
       listener()->OnChannelListenError();
     } else {
       listener()->OnChannelError();
     }
   }
 }
 
 int ChannelPosix::GetHelloMessageProcId() const {
-  int pid = base::GetCurrentProcId();
-#if defined(OS_LINUX)
-  // Our process may be in a sandbox with a separate PID namespace.
-  if (global_pid_) {
-    pid = global_pid_;
-  }
+#if defined(OS_LINUX) || defined(OS_NACL_NONSFI)
+  // Our process may be in a sandbox with a separate PID namespace in Linux.
+  // In nacl_helper_nonsfi, getpid() invoked by GetCurrentProcId() is not
+  // allowed and would cause a SIGSYS crashing because of seccomp sandbox.

[dmichael (off chromium), 2014/11/05 23:48:41]

nit: of +the+ seccomp sandbox

[hidehiko, 2014/11/06 14:19:30]

Done.

+  // |global_pid_| should be initialized in advance in the process.
+  if (global_pid_)
+    return global_pid_;
 #endif
-  return pid;
+  return base::GetCurrentProcId();
 }
 
 void ChannelPosix::QueueHelloMessage() {
   // Create the Hello message
   scoped_ptr<Message> msg(new Message(MSG_ROUTING_NONE,
                                       HELLO_MESSAGE_TYPE,
                                       IPC::Message::PRIORITY_NORMAL));
   if (!msg->WriteInt(GetHelloMessageProcId())) {
     NOTREACHED() << "Unable to pickle hello message proc id";
   }
@@ skipping 312 matching lines @@
 
   return id.append(GenerateUniqueRandomChannelID());
 }
 
 
 bool Channel::IsNamedServerInitialized(
     const std::string& channel_id) {
   return ChannelPosix::IsNamedServerInitialized(channel_id);
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_NACL_NONSFI)
 // static
 void Channel::SetGlobalPid(int pid) {
   ChannelPosix::SetGlobalPid(pid);
 }
-#endif  // OS_LINUX
+#endif  // defined(OS_LINUX) || defined(OS_NACL_NONSFI)
 
 }  // namespace IPC