mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: skip zygote for unsandboxed ppapi processes (#17823)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-04-16 18:32:37 -04:00 committed by GitHub
parent 78411db4b5
commit 33fd20047c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
patches/common/chromium/.patches
View file

@ -73,3 +73,4 @@ fix_disable_usage_of_setapplicationisdaemon_and.patch
disable_custom_libcxx_on_windows.patch disable_custom_libcxx_on_windows.patch
fix_retain_compatibility_with_msvc.patch fix_retain_compatibility_with_msvc.patch
disable_network_services_by_default.patch disable_network_services_by_default.patch
unsandboxed_ppapi_processes_skip_zygote.patch

20
patches/common/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Normal file
View file

@ -0,0 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Tue, 16 Apr 2019 11:25:08 -0700
Subject: unsandboxed ppapi processes skip zygote
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 2d57937dfffb4ea85739f27780e53c04ef087f58..39a21171b4584cc6f45e2407a02dee2609603249 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -106,6 +106,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate
service_manager::ZygoteHandle GetZygote() override {
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
+ if (browser_command_line.HasSwitch(service_manager::switches::kNoSandbox)) {
+ return nullptr;
+ }
base::CommandLine::StringType plugin_launcher = browser_command_line
.GetSwitchValueNative(switches::kPpapiPluginLauncher);
if (is_broker_ || !plugin_launcher.empty())