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

Unified Diff: sandbox/mac/bootstrap_sandbox.cc

Issue 264923003: Initial implementation of the Mac Bootstrap Sandbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: sandbox/mac/bootstrap_sandbox.cc
diff --git a/sandbox/mac/bootstrap_sandbox.cc b/sandbox/mac/bootstrap_sandbox.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9fdbbf0e4e186950ca98a9fbc961b9c238304789
--- /dev/null
+++ b/sandbox/mac/bootstrap_sandbox.cc
@@ -0,0 +1,111 @@
+// Copyright 2014 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 "sandbox/mac/bootstrap_sandbox.h"
+
+#include "base/logging.h"
+
+#include "sandbox/mac/launchd_interception_server.h"
+
+namespace sandbox {
+
+// static
+scoped_ptr<BootstrapSandbox> BootstrapSandbox::Create() {
+ scoped_ptr<BootstrapSandbox> sandbox(new BootstrapSandbox());
+ sandbox->server_.reset(new LaunchdInterceptionServer(sandbox.get()));
+
+ if (!sandbox->server_->Initialize()) {
+ sandbox.reset();
+ } else {
+ kern_return_t kr = task_set_special_port(mach_task_self(),
+ TASK_BOOTSTRAP_PORT, sandbox->server_->server_port());
Mark Mentovai 2014/05/06 20:51:50 There’s a global extern mach_port_t named bootstra
Robert Sesek 2014/05/08 20:58:12 Right, this is something that I considered but was
Mark Mentovai 2014/05/09 20:11:19 rsesek wrote:
Robert Sesek 2014/05/09 22:04:03 Done.
+ if (kr != KERN_SUCCESS)
+ sandbox.reset();
+ }
+
+ return sandbox.Pass();
+}
+
+BootstrapSandbox::~BootstrapSandbox() {
+ CHECK_EQ(KERN_SUCCESS, task_set_special_port(mach_task_self(),
+ TASK_BOOTSTRAP_PORT, real_bootstrap_port_));
+}
+
+void BootstrapSandbox::RegisterSandboxPolicy(
+ int sandbox_policy_id,
+ const BootstrapSandboxPolicy& policy) {
+ DCHECK(IsPolicyValid(policy));
Mark Mentovai 2014/05/06 20:51:50 You’re CHECKy elsewhere, why’d you land on DCHECK
Robert Sesek 2014/05/08 20:58:12 Done.
+ DCHECK_GT(sandbox_policy_id, 0);
+ base::AutoLock lock(lock_);
+ DCHECK(policies_.find(sandbox_policy_id) == policies_.end());
+ policies_.insert(std::make_pair(sandbox_policy_id, policy));
+}
+
+bool BootstrapSandbox::PrepareToForkWithPolicy(int sandbox_policy_id) {
+ base::AutoLock lock(lock_);
+
+ // Make sure the policy exists.
+ if (policies_.find(sandbox_policy_id) == policies_.end())
+ return false;
Mark Mentovai 2014/05/06 20:51:50 Based on the implementation here, it appears that
Robert Sesek 2014/05/08 20:58:12 Not really, because the child could start executin
+
+ // Make sure that we aren't trying to fork() on two different threads
+ // simultaneously.
+ CHECK(!is_across_fork_) << "Cannot interleave PrepareToForkWithPolicy()";
+ is_across_fork_ = true;
+
+ // Store the policy for the process we're about to create.
+ effective_policy_id_ = sandbox_policy_id;
+
+ return true;
+}
+
+void BootstrapSandbox::FinishedFork(base::ProcessHandle handle) {
+ base::AutoLock lock(lock_);
+ CHECK(is_across_fork_) <<
+ "Must PrepareToForkWithPolicy() before FinishedFork()";
+ is_across_fork_ = false;
+
+ const auto& existing_process = sandboxed_processes_.find(handle);
+ CHECK(existing_process == sandboxed_processes_.end());
+ sandboxed_processes_.insert(std::make_pair(handle, effective_policy_id_));
+
+ VLOG(3) << "Bootstrap sandbox enforced for pid " << handle;
+
+ effective_policy_id_ = -1;
+}
+
+void BootstrapSandbox::ChildDied(base::ProcessHandle handle) {
+ base::AutoLock lock(lock_);
+ sandboxed_processes_.erase(handle);
Mark Mentovai 2014/05/06 20:51:50 You were very CHECKy about things not being in the
Robert Sesek 2014/05/08 20:58:12 Done.
+}
+
+const BootstrapSandboxPolicy* BootstrapSandbox::PolicyForProcess(
+ pid_t pid) const {
+ base::AutoLock lock(lock_);
+ const auto& process = sandboxed_processes_.find(pid);
+
+ int policy_id = -1;
+ // The new child could send bootstrap requests before the parent calls
+ // FinishFork().
+ if (process != sandboxed_processes_.end()) {
+ policy_id = process->second;
+ } else if (is_across_fork_) {
+ policy_id = effective_policy_id_;
+ }
Mark Mentovai 2014/05/06 20:51:50 You can just say “else return NULL” here and not h
Robert Sesek 2014/05/08 20:58:12 This is because effective_policy_id_ could be -1.
+
+ if (policy_id == -1)
+ return NULL;
+
+ return &policies_.find(policy_id)->second;
+}
+
+BootstrapSandbox::BootstrapSandbox()
+ : real_bootstrap_port_(MACH_PORT_NULL),
+ is_across_fork_(false),
+ effective_policy_id_(-1) {
+ CHECK_EQ(KERN_SUCCESS, task_get_special_port(
+ mach_task_self(), TASK_BOOTSTRAP_PORT, &real_bootstrap_port_));
Mark Mentovai 2014/05/06 20:51:50 When you task_get_special_port, you need to mach_p
Robert Sesek 2014/05/08 20:58:12 Done.
+}
+
+} // namespace sandbox

Powered by Google App Engine
This is Rietveld 408576698