diff options
| author | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 16:25:53 +0000 |
|---|---|---|
| committer | jln@chromium.org <jln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-13 16:25:53 +0000 |
| commit | a439509cc837f9e1a4dc5eb96deb95345a58cbba (patch) | |
| tree | fce2dc924202bd41d4b182582dbd8ce276c01948 /sandbox | |
| parent | e7e8f28269e18aaabb0a2b56bd66c71e16f5bbf6 (diff) | |
| download | chromium_src-a439509cc837f9e1a4dc5eb96deb95345a58cbba.zip chromium_src-a439509cc837f9e1a4dc5eb96deb95345a58cbba.tar.gz chromium_src-a439509cc837f9e1a4dc5eb96deb95345a58cbba.tar.bz2 | |
Revert 239894 "Linux Sandbox: check no threads before fork()."
BUG=327241, 328249
> Linux Sandbox: check no threads before fork().
>
> Always check that no threads are running before fork().
>
> BUG=327241
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/108173008
TBR=jln@chromium.org
Review URL: https://codereview.chromium.org/106903012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/linux/seccomp-bpf/sandbox_bpf.cc | 4 | ||||
| -rw-r--r-- | sandbox/linux/services/broker_process.cc | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sandbox/linux/seccomp-bpf/sandbox_bpf.cc b/sandbox/linux/seccomp-bpf/sandbox_bpf.cc index 6b2327e..15faef6 100644 --- a/sandbox/linux/seccomp-bpf/sandbox_bpf.cc +++ b/sandbox/linux/seccomp-bpf/sandbox_bpf.cc @@ -268,10 +268,6 @@ bool SandboxBPF::RunFunctionInPolicy(void (*code_in_sandbox)(), SANDBOX_DIE("Process started without standard file descriptors"); } - // This code is using fork() and should only ever run single-threaded. - // Most of the code below is "async-signal-safe" and only minor changes - // would be needed to support threads. - DCHECK(IsSingleThreaded(proc_fd_)); pid_t pid = fork(); if (pid < 0) { // Die if we cannot fork(). We would probably fail a little later diff --git a/sandbox/linux/services/broker_process.cc b/sandbox/linux/services/broker_process.cc index 438e972..316883d 100644 --- a/sandbox/linux/services/broker_process.cc +++ b/sandbox/linux/services/broker_process.cc @@ -21,7 +21,6 @@ #include "base/pickle.h" #include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket_linux.h" -#include "base/process/process_metrics.h" #include "build/build_config.h" #include "sandbox/linux/services/linux_syscalls.h" @@ -147,7 +146,6 @@ bool BrokerProcess::Init(bool (*sandbox_callback)(void)) { return false; } - DCHECK_EQ(1, base::GetNumberOfThreads(base::GetCurrentProcessHandle())); int child_pid = fork(); if (child_pid == -1) { close(socket_pair[0]); |