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

support_mixed_sandbox_with_zygote.patch 4.3 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990 
  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 1b82a6df5ada9c9c8536225b8bc7a9dd4aa7e8dd..e45de1723b133d529e8eb0c5b019c1b98e994173 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. @@ -1754,6 +1754,10 @@ bool RenderProcessHostImpl::Init() {
    29. 

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

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

  31.              *cmd_line, IsPdf(), IsJitDisabled());
    32. 

  32. +#elif BUILDFLAG(USE_ZYGOTE)
    33. 

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

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

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

  36.  #else
    37. 

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

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

  39. diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
    40. 

  40. index 9f66bec84f6284d3f20e59342d3e0a7b2917f836..affaca4776178365fe5d3024d2f733c01da07e09 100644
    41. 

  41. --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
    42. 

  42. +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.cc
    43. 

  43. @@ -35,6 +35,9 @@ namespace content {
    44. 

  44.  
    45. 

  45.  #if BUILDFLAG(USE_ZYGOTE)
    46. 

  46.  ZygoteCommunication* RendererSandboxedProcessLauncherDelegate::GetZygote() {
    47. 

  47. +  if (!use_zygote_) {
    48. 

  48. +    return nullptr;
    49. 

  49. +  }
    50. 

  50.    const base::CommandLine& browser_command_line =
    51. 

  51.        *base::CommandLine::ForCurrentProcess();
    52. 

  52.    base::CommandLine::StringType renderer_prefix =
    53. 

  53. @@ -70,6 +73,9 @@ RendererSandboxedProcessLauncherDelegateWin::
    54. 

  54.        is_pdf_renderer_(is_pdf_renderer) {
    55. 

  55.    // PDF renderers must be jitless.
    56. 

  56.    CHECK(!is_pdf_renderer || is_jit_disabled);
    57. 

  57. +#if BUILDFLAG(USE_ZYGOTE)
    58. 

  58. +  use_zygote_ = !cmd_line->HasSwitch(switches::kNoZygote);
    59. 

  59. +#endif
    60. 

  60.    if (is_jit_disabled) {
    61. 

  61.      dynamic_code_can_be_disabled_ = true;
    62. 

  62.      return;
    63. 

  63. diff --git a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
    64. 

  64. index e77326f149febfb1e236f221757fe24b989e01c0..4f621d8c36706557151560b2a6e0821a46f39c7f 100644
    65. 

  65. --- a/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
    66. 

  66. +++ b/content/browser/renderer_host/renderer_sandboxed_process_launcher_delegate.h
    67. 

  67. @@ -18,6 +18,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
    68. 

  68.   public:
    69. 

  69.    RendererSandboxedProcessLauncherDelegate() = default;
    70. 

  70.  
    71. 

  71. +#if BUILDFLAG(USE_ZYGOTE)
    72. 

  72. +  RendererSandboxedProcessLauncherDelegate(bool use_zygote):
    73. 

  73. +    use_zygote_(use_zygote) {}
    74. 

  74. +#endif
    75. 

  75. +
    76. 

  76.    ~RendererSandboxedProcessLauncherDelegate() override = default;
    77. 

  77.  
    78. 

  78.  #if BUILDFLAG(USE_ZYGOTE)
    79. 

  79. @@ -30,6 +35,11 @@ class CONTENT_EXPORT RendererSandboxedProcessLauncherDelegate
    80. 

  80.  
    81. 

  81.    // sandbox::policy::SandboxDelegate:
    82. 

  82.    sandbox::mojom::Sandbox GetSandboxType() override;
    83. 

  83. +
    84. 

  84. + private:
    85. 

  85. +#if BUILDFLAG(USE_ZYGOTE)
    86. 

  86. +  bool use_zygote_ = true;
    87. 

  87. +#endif
    88. 

  88.  };
    89. 

  89.  
    90. 

  90.  #if BUILDFLAG(IS_WIN)
    91.