8383c14aba
* chore: bump chromium in DEPS to 91c9f44297abe2844f593ec7956e6ce79c81f463 * chore: update chromium patches * chore: update v8 patches * build: service_names.mojom has been deleted Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2568681 * chore: add DISPLAY_CAPTURE permission to converter Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2551098 * chore: handle AXPropertyFilter::SCRIPT in accessibility_ui Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2563923 * refactor: web_isolated_world_ids.h has been deleted Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2585255 * refactor: ResourceType has been deprecated / removed in ExtensionsBrowserClient Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2562002 * chore: fix lint * chore: remove deleted headers * build: disable gn check for blink header * fix: refactor X11 event handling Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2577887 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2585750 * chore: update patches * chore: bump chromium in DEPS to bfd8e7dbd37af8b1bc40d887815edd5a29496fa3 * chore: update patches * refactor: xeventobserver is now x11:eventobserver Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2585750 * refactor: remove UseWebUIBindingsForURL Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2583590 * chore: DidProcessXEvent has been removed * chore: bump chromium in DEPS to b13e791d7244a08d9d61dbfa2bb2b6cdf1ff6294 * chore: update patches * build: change gfx::GetAtom to x11:GetAtom Refs:d972a0ae4a
* build: change gfx namespace to x11 Ref:d972a0ae4a
* build: change ui namespace to x11 Refs:c38f8571a8
:ui/gfx/x/xproto_util.h;dlc=ba9145d0c7f2b10e869e2ba482ca05b75ca35812 * chore: add patch to fix blink prefs fetching during frame swap * chore: fix lint * fix: do not make invalid SKImageRep in FrameSubscriber Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2572896 Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
84 lines
3.5 KiB
Diff
84 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Wed, 28 Nov 2018 13:20:27 -0800
|
|
Subject: support_mixed_sandbox_with_zygote.patch
|
|
|
|
On Linux, Chromium launches all new renderer processes via a "zygote"
|
|
process which has the sandbox pre-initialized (see
|
|
//docs/linux_zygote.md). In order to support mixed-sandbox mode, in
|
|
which some renderers are launched with the sandbox engaged and others
|
|
without it, we need the option to launch non-sandboxed renderers without
|
|
going through the zygote.
|
|
|
|
Chromium already supports a `--no-zygote` flag, but it turns off the
|
|
zygote completely, and thus also disables sandboxing. This patch allows
|
|
the `--no-zygote` flag to affect renderer processes on a case-by-case
|
|
basis, checking immediately prior to launch whether to go through the
|
|
zygote or not based on the command-line of the to-be-launched renderer.
|
|
|
|
This patch could conceivably be upstreamed, as it does not affect
|
|
production Chromium (which does not use the `--no-zygote` flag).
|
|
However, the patch would need to be reviewed by the security team, as it
|
|
does touch a security-sensitive class.
|
|
|
|
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
|
index b0309af577e9929b7cf244a2f076d5942ce45c5b..cd53727d64bf7d3b265fb6e3e95fa3b5390b091f 100644
|
|
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
|
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
|
@@ -400,6 +400,11 @@ class RendererSandboxedProcessLauncherDelegate
|
|
{
|
|
}
|
|
|
|
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
|
+ RendererSandboxedProcessLauncherDelegate(bool use_zygote):
|
|
+ use_zygote_(use_zygote) {}
|
|
+#endif
|
|
+
|
|
~RendererSandboxedProcessLauncherDelegate() override {}
|
|
|
|
#if defined(OS_WIN)
|
|
@@ -421,6 +426,9 @@ class RendererSandboxedProcessLauncherDelegate
|
|
|
|
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
|
ZygoteHandle GetZygote() override {
|
|
+ if (!use_zygote_) {
|
|
+ return nullptr;
|
|
+ }
|
|
const base::CommandLine& browser_command_line =
|
|
*base::CommandLine::ForCurrentProcess();
|
|
base::CommandLine::StringType renderer_prefix =
|
|
@@ -435,10 +443,13 @@ class RendererSandboxedProcessLauncherDelegate
|
|
return sandbox::policy::SandboxType::kRenderer;
|
|
}
|
|
|
|
-#if defined(OS_WIN)
|
|
private:
|
|
+#if defined(OS_WIN)
|
|
const bool renderer_code_integrity_enabled_;
|
|
#endif
|
|
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
|
+ bool use_zygote_ = true;
|
|
+#endif
|
|
};
|
|
|
|
const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
|
|
@@ -1806,11 +1817,18 @@ bool RenderProcessHostImpl::Init() {
|
|
cmd_line->PrependWrapper(renderer_prefix);
|
|
AppendRendererCommandLine(cmd_line.get());
|
|
|
|
+#if BUILDFLAG(USE_ZYGOTE_HANDLE)
|
|
+ bool use_zygote = !cmd_line->HasSwitch(switches::kNoZygote);
|
|
+ auto delegate = std::make_unique<RendererSandboxedProcessLauncherDelegate>(use_zygote);
|
|
+#else
|
|
+ auto delegate = std::make_unique<RendererSandboxedProcessLauncherDelegate>();
|
|
+#endif
|
|
+
|
|
// Spawn the child process asynchronously to avoid blocking the UI thread.
|
|
// As long as there's no renderer prefix, we can use the zygote process
|
|
// at this stage.
|
|
child_process_launcher_ = std::make_unique<ChildProcessLauncher>(
|
|
- std::make_unique<RendererSandboxedProcessLauncherDelegate>(),
|
|
+ std::move(delegate),
|
|
std::move(cmd_line), GetID(), this, std::move(mojo_invitation_),
|
|
base::BindRepeating(&RenderProcessHostImpl::OnMojoError, id_),
|
|
GetV8SnapshotFilesToPreload());
|