NaCl: Clean up how FDs are passed to nacl_helper instances on Linux

content/public/common/zygote_fork_delegate_linux.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_ZYGOTE_FORK_DELEGATE_LINUX_H_
 #define CONTENT_PUBLIC_COMMON_ZYGOTE_FORK_DELEGATE_LINUX_H_
 
 #include <unistd.h>
 
 #include <string>
@@ skipping 25 matching lines @@
   virtual void InitialUMA(std::string* uma_name,
                           int* uma_sample,
                           int* uma_boundary_value) = 0;
 
   // Returns 'true' if the delegate would like to handle a given fork
   // request.  Otherwise returns false.  Optionally, fills in uma_name et al
   // with a report the helper wants to make via UMA_HISTOGRAM_ENUMERATION.
   virtual bool CanHelp(const std::string& process_type, std::string* uma_name,
                        int* uma_sample, int* uma_boundary_value) = 0;
 
+  // Indexes of FDs in the vector passed to Fork().
+  enum {
+    // Used to pass in the descriptor for talking to the Browser
+    kBrowserFDIndex = 0,
+    // The next two are used in the protocol for discovering the
+    // child processes real PID from within the SUID sandbox. See
+    // http://code.google.com/p/chromium/wiki/LinuxZygote
+    kDummyFDIndex = 1,
+    kParentFDIndex = 2

[jln (very slow on Chromium), 2013/10/07 18:12:06]

With MACRO_STYLE, in Chromium, it's typical to have a *_END member at the end to
be used as a count. In this case it could be kNumPassedFds or something similar.

(Also FYI, strictly speaking the Chromium style guide says to continue using
MACRO_STYLE for enums. In this case the enum is merely a way to define constants
and never used as a type, so I think your way is better).

[Mark Seaborn, 2013/10/08 18:31:06]

Added kNumPassedFds.
OK, I've left it as the "k*" style.

+  };
+
   // Delegate forks, returning a -1 on failure. Outside the
   // suid sandbox, Fork() returns the Linux process ID.
   // This method is not aware of any potential pid namespaces, so it'll
   // return a raw pid just like fork() would.
   virtual pid_t Fork(const std::vector<int>& fds) = 0;
 
   // After a successful fork, signal the child to indicate that
   // the child's PID has been received. Also communicate the
   // channel switch as a part of acknowledgement message.
   virtual bool AckChild(int fd, const std::string& channel_switch) = 0;
 
   // The fork delegate must also assume the role of waiting for its children
   // since the caller will not be their parents and cannot do it. |pid| here
   // should be a pid that has been returned by the Fork() method. i.e. This
   // method is completely unaware of eventual PID namespaces due to sandboxing.
   // |known_dead| indicates that the process is already dead and that a
   // blocking wait() should be performed. In this case, GetTerminationStatus()
   // will send a SIGKILL to the target process first.
   virtual bool GetTerminationStatus(pid_t pid, bool known_dead,
                                     base::TerminationStatus* status,
                                     int* exit_code) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_ZYGOTE_FORK_DELEGATE_LINUX_H_