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
|
--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2023-12-12 22:08:45 UTC
+++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc
@@ -20,13 +20,19 @@
#include "build/chromeos_buildflags.h"
#include "content/common/zygote/zygote_commands_linux.h"
#include "content/common/zygote/zygote_communication_linux.h"
+#if !BUILDFLAG(IS_BSD)
#include "content/common/zygote/zygote_handle_impl_linux.h"
#include "content/public/common/zygote/zygote_handle.h"
+#endif
#include "sandbox/linux/services/credentials.h"
#include "sandbox/linux/services/namespace_sandbox.h"
#include "sandbox/linux/suid/client/setuid_sandbox_host.h"
#include "sandbox/linux/suid/common/sandbox.h"
+#if BUILDFLAG(IS_BSD)
+#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
#include "sandbox/policy/switches.h"
#if BUILDFLAG(IS_CHROMEOS)
@@ -39,6 +45,7 @@ namespace {
namespace {
+#if !BUILDFLAG(IS_BSD)
// Receive a fixed message on fd and return the sender's PID.
// Returns true if the message received matches the expected message.
bool ReceiveFixedMessage(int fd,
@@ -60,6 +67,7 @@ bool ReceiveFixedMessage(int fd,
return false;
return true;
}
+#endif
} // namespace
@@ -69,9 +77,13 @@ ZygoteHostImpl::ZygoteHostImpl()
}
ZygoteHostImpl::ZygoteHostImpl()
+#if !BUILDFLAG(IS_BSD)
: use_namespace_sandbox_(false),
use_suid_sandbox_(false),
use_suid_sandbox_for_adj_oom_score_(false),
+#else
+ :
+#endif
sandbox_binary_(),
zygote_pids_lock_(),
zygote_pids_() {}
@@ -84,6 +96,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
}
void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
+#if !BUILDFLAG(IS_BSD)
if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
return;
}
@@ -134,6 +147,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
"you can try using --"
<< sandbox::policy::switches::kNoSandbox << ".";
}
+#endif
}
void ZygoteHostImpl::AddZygotePid(pid_t pid) {
@@ -158,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
base::CommandLine* cmd_line,
base::ScopedFD* control_fd,
base::FileHandleMappingVector additional_remapped_fds) {
+#if !BUILDFLAG(IS_BSD)
int fds[2];
#if !defined(TOOLKIT_QT)
CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
@@ -232,9 +247,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
AddZygotePid(pid);
return pid;
+#else
+ return 0;
+#endif
}
-#if !BUILDFLAG(IS_OPENBSD)
+#if !BUILDFLAG(IS_BSD)
void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
int score) {
// 1) You can't change the oom_score_adj of a non-dumpable process
|
