Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Unified Diff: components/nacl/loader/nacl_helper_linux.cc

Issue 1158793003: Enable one PID namespace per process for NaCl processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Enable PID namespace per process for nonsfi newlib NaCl as well. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/nacl/loader/nonsfi/irt_exception_handling.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_helper_linux.cc
diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
index 5b92b5c1023388451d16c9ef96b7d97af97e14ef..123395127682e160b7de75102ec47724e748986f 100644
--- a/components/nacl/loader/nacl_helper_linux.cc
+++ b/components/nacl/loader/nacl_helper_linux.cc
@@ -41,7 +41,9 @@
#include "crypto/nss_util.h"
#include "ipc/ipc_descriptors.h"
#include "ipc/ipc_switches.h"
+#include "sandbox/linux/services/credentials.h"
#include "sandbox/linux/services/libc_urandom_override.h"
+#include "sandbox/linux/services/namespace_sandbox.h"
#if defined(OS_NACL_NONSFI)
#include "native_client/src/public/nonsfi/irt_exception_handling.h"
@@ -190,12 +192,28 @@ bool HandleForkRequest(ScopedVector<base::ScopedFD> child_fds,
}
VLOG(1) << "nacl_helper: forking";
- pid_t child_pid = fork();
+ pid_t child_pid;
+ if (sandbox::NamespaceSandbox::InNewUserNamespace()) {
+ child_pid = sandbox::NamespaceSandbox::ForkInNewPidNamespace(
+ /*drop_capabilities_in_child=*/true);
+ } else {
+ child_pid = sandbox::Credentials::ForkAndDropCapabilitiesInChild();
+ }
+
if (child_pid < 0) {
PLOG(ERROR) << "*** fork() failed.";
}
if (child_pid == 0) {
+ // Install termiantion signal handlers for nonsfi NaCl. The SFI NaCl runtime
+ // will install signal handlers for SIGINT, SIGTERM, etc. so we do not need
+ // to install termination signal handlers ourselves (in fact, it will crash
+ // if signal handlers for these are present).
+ if (uses_nonsfi_mode && getpid() == 1) {
+ // Note that nonsfi NaCl may override some of these signal handlers, which
+ // is fine.
+ sandbox::NamespaceSandbox::InstallDefaultTerminationSignalHandlers();
+ }
ChildNaClLoaderInit(child_fds.Pass(),
system_info,
uses_nonsfi_mode,
« no previous file with comments | « no previous file | components/nacl/loader/nonsfi/irt_exception_handling.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698