Allow the seccomp sandbox to be enabled, even if the suid sandbox has...

sandbox/linux/seccomp/access.cc

Index: sandbox/linux/seccomp/access.cc
===================================================================
--- sandbox/linux/seccomp/access.cc	(revision 31339)
+++ sandbox/linux/seccomp/access.cc	(working copy)
@@ -29,7 +29,7 @@
   return static_cast<int>(rc);
 }
 
-bool Sandbox::process_access(int parentProc, int sandboxFd, int threadFdPub,
+bool Sandbox::process_access(int parentMapsFd, int sandboxFd, int threadFdPub,
                            int threadFd, SecureMem::Args* mem) {
   // Read request
   SysCalls sys;
@@ -56,7 +56,7 @@
     }
     return false;
   }
-  SecureMem::lockSystemCall(parentProc, mem);
+  SecureMem::lockSystemCall(parentMapsFd, mem);
   if (read(sys, sandboxFd, mem->pathname, access_req.path_length) !=
       (ssize_t)access_req.path_length) {
     goto read_parm_failed;
@@ -68,7 +68,7 @@
                   "\"").c_str());
 
   // Tell trusted thread to access the file.
-  SecureMem::sendSystemCall(threadFdPub, true, parentProc, mem, __NR_access,
+  SecureMem::sendSystemCall(threadFdPub, true, parentMapsFd, mem, __NR_access,
                             mem->pathname - (char*)mem + (char*)mem->self,
                             access_req.mode);
   return true;
Property changes on: sandbox/linux/seccomp/access.cc
___________________________________________________________________
Added: svn:eol-style
   + LF