Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 28ada6ea8b
Branches Tags
electron
/
patches
/
chromium
/
support_mixed_sandbox_with_zygote.patch

support_mixed_sandbox_with_zygote.patch 4.6 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Jeremy Apthorp <[email protected]>
    3. 

  3. Date: Wed, 28 Nov 2018 13:20:27 -0800
    4. 

  4. Subject: support_mixed_sandbox_with_zygote.patch
    5. 

  5. 

  6. On Linux, Chromium launches all new renderer processes via a "zygote"
    7. 

  7. process which has the sandbox pre-initialized (see
    8. 

  8. //docs/linux_zygote.md). In order to support mixed-sandbox mode, in
    9. 

  9. which some renderers are launched with the sandbox engaged and others
    10. 

  10. without it, we need the option to launch non-sandboxed renderers without
    11. 

  11. going through the zygote.
    12. 

  12. 

  13. Chromium already supports a `--no-zygote` flag, but it turns off the
    14. 

  14. zygote completely, and thus also disables sandboxing. This patch allows
    15. 

  15. the `--no-zygote` flag to affect renderer processes on a case-by-case
    16. 

  16. basis, checking immediately prior to launch whether to go through the
    17. 

  17. zygote or not based on the command-line of the to-be-launched renderer.
    18. 

  18. 

  19. This patch could conceivably be upstreamed, as it does not affect
    20. 

  20. production Chromium (which does not use the `--no-zygote` flag).
    21. 

  21. However, the patch would need to be reviewed by the security team, as it
    22. 

  22. does touch a security-sensitive class.
    23. 

  23. 

  24. diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
    25. 

  25. index 064b5642425290f1d9ab82f75b22fd43973ebf5b..30a0c9216a206042a9769bdeda015eaf00e3cc49 100644
    26. 

  26. --- a/content/browser/renderer_host/render_process_host_impl.cc
    27. 

  27. +++ b/content/browser/renderer_host/render_process_host_impl.cc
    28. 

  28. @@ -1835,9 +1835,15 @@ bool RenderProcessHostImpl::Init() {
    29. 

  29.      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
    30. 

  30.          std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
    31. 

  31.              cmd_line.get(), IsJitDisabled());
    32. 

  32. +#else
    33. 

  33. +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
    34. 

  34. +    bool use_zygote = !cmd_line->HasSwitch(switches::kNoZygote);
    35. 

  35. +    std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
    36. 

  36. +        std::make_unique<RendererSandboxedProcessLauncherDelegate>(use_zygote);
    37. 

  37.  #else
    38. 

  38.      std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
    39. 

  39.          std::make_unique<RendererSandboxedProcessLauncherDelegate>();
    40. 

  40. +#endif
    41. 

  41.  #endif
    42. 

  42.      // Spawn the child process asynchronously to avoid blocking the UI thread.
    43. 

  43.      // As long as there's no renderer prefix, we can use the zygote process
    44. 

  44. diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
    45. 

  45. index e8d6ef94664bb37996871c0cc0db7c815783b786..0d56fa0aebee80883019a100900119972bf02edd 100644
    46. 

  46. --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
    47. 

  47. +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
    48. 

  48. @@ -25,6 +25,9 @@ namespace content {
    49. 

  49.  
    50. 

  50.  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
    51. 

  51.  ZygoteHandle RendererSandboxedProcessLauncherDelegate::GetZygote() {
    52. 

  52. +  if (!use_zygote_) {
    53. 

  53. +    return nullptr;
    54. 

  54. +  }
    55. 

  55.    const base::CommandLine& browser_command_line =
    56. 

  56.        *base::CommandLine::ForCurrentProcess();
    57. 

  57.    base::CommandLine::StringType renderer_prefix =
    58. 

  58. @@ -52,6 +55,9 @@ RendererSandboxedProcessLauncherDelegateWin::
    59. 

  59.                                                  bool is_jit_disabled)
    60. 

  60.      : renderer_code_integrity_enabled_(
    61. 

  61.            GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()) {
    62. 

  62. +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
    63. 

  63. +  use_zygote_ = !cmd_line->HasSwitch(switches::kNoZygote);
    64. 

  64. +#endif
    65. 

  65.    if (is_jit_disabled) {
    66. 

  66.      dynamic_code_can_be_disabled_ = true;
    67. 

  67.      return;
    68. 

  68. diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
    69. 

  69. index 463df70c55df932427c761a67dbc89d7657f9703..d6d8094e31129eb7ca1f0bf36523d48204281795 100644
    70. 

  70. --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
    71. 

  71. +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
    72. 

  72. @@ -18,6 +18,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
    73. 

  73.   public:
    74. 

  74.    RendererSandboxedProcessLauncherDelegate() = default;
    75. 

  75.  
    76. 

  76. +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
    77. 

  77. +  RendererSandboxedProcessLauncherDelegate(bool use_zygote):
    78. 

  78. +    use_zygote_(use_zygote) {}
    79. 

  79. +#endif
    80. 

  80. +
    81. 

  81.    ~RendererSandboxedProcessLauncherDelegate() override = default;
    82. 

  82.  
    83. 

  83.  #if BUILDFLAG(USE_ZYGOTE_HANDLE)
    84. 

  84. @@ -29,6 +34,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
    85. 

  85.  #endif  // BUILDFLAG(IS_MAC)
    86. 

  86.  
    87. 

  87.    sandbox::mojom::Sandbox GetSandboxType() override;
    88. 

  88. +
    89. 

  89. + private:
    90. 

  90. +#if BUILDFLAG(USE_ZYGOTE_HANDLE)
    91. 

  91. +  bool use_zygote_ = true;
    92. 

  92. +#endif
    93. 

  93.  };
    94. 

  94.  
    95. 

  95.  #if BUILDFLAG(IS_WIN)
    96.