1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
--- content/browser/utility_process_host_impl.cc.orig 2017-04-19 19:06:33 UTC
+++ content/browser/utility_process_host_impl.cc
@@ -44,9 +44,9 @@
#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/ui_base_switches.h"
-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
#include "content/public/browser/zygote_handle_linux.h"
-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
#if defined(OS_WIN)
#include "sandbox/win/src/sandbox_policy.h"
@@ -55,11 +55,11 @@
namespace content {
-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
namespace {
ZygoteHandle g_utility_zygote;
} // namespace
-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
// NOTE: changes to this class need to be reviewed by the security team.
class UtilitySandboxedProcessLauncherDelegate
@@ -74,10 +74,10 @@ class UtilitySandboxedProcessLauncherDel
launch_elevated_(launch_elevated)
#elif defined(OS_POSIX)
env_(env)
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
,
no_sandbox_(no_sandbox)
-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
#endif // OS_WIN
{}
@@ -106,13 +106,13 @@ class UtilitySandboxedProcessLauncherDel
#elif defined(OS_POSIX)
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
ZygoteHandle* GetZygote() override {
if (no_sandbox_ || !exposed_dir_.empty())
return nullptr;
return GetGenericZygote();
}
-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
base::EnvironmentMap GetEnvironment() override { return env_; }
#endif // OS_WIN
@@ -127,9 +127,9 @@ class UtilitySandboxedProcessLauncherDel
bool launch_elevated_;
#elif defined(OS_POSIX)
base::EnvironmentMap env_;
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
bool no_sandbox_;
-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
#endif // OS_WIN
};
@@ -154,7 +154,7 @@ UtilityProcessHostImpl::UtilityProcessHo
is_batch_mode_(false),
no_sandbox_(false),
run_elevated_(false),
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
#else
child_flags_(ChildProcessHost::CHILD_NORMAL),
@@ -236,13 +236,13 @@ void UtilityProcessHostImpl::SetName(con
name_ = name;
}
-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
// static
void UtilityProcessHostImpl::EarlyZygoteLaunch() {
DCHECK(!g_utility_zygote);
g_utility_zygote = CreateZygote();
}
-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
bool UtilityProcessHostImpl::StartProcess() {
if (started_)
|
