diff options
Diffstat (limited to 'www/chromium/files/patch-sandbox_policy_sandbox.cc')
| -rw-r--r-- | www/chromium/files/patch-sandbox_policy_sandbox.cc | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.cc b/www/chromium/files/patch-sandbox_policy_sandbox.cc index 8135427d7a88..7e2c8176a47b 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox.cc @@ -1,35 +1,22 @@ ---- sandbox/policy/sandbox.cc.orig 2022-01-20 10:36:01 UTC +--- sandbox/policy/sandbox.cc.orig 2022-02-07 13:39:41 UTC +++ sandbox/policy/sandbox.cc -@@ -13,6 +13,10 @@ - #include "base/android/jni_android.h" - #endif // defined(OS_ANDROID) - -+#if defined(OS_FREEBSD) -+#include "sandbox/policy/freebsd/sandbox_freebsd.h" -+#endif // defined(OS_FREEBSD) -+ - #if defined(OS_LINUX) || defined(OS_CHROMEOS) +@@ -17,6 +17,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -@@ -30,6 +34,12 @@ + ++#if defined(OS_BSD) ++#include "sandbox/policy/openbsd/sandbox_openbsd.h" ++#endif // defined(OS_BSD) ++ + #if defined(OS_MAC) + #include "sandbox/mac/seatbelt.h" + #endif // defined(OS_MAC) +@@ -30,7 +34,7 @@ namespace sandbox { namespace policy { -+#if defined(OS_FREEBSD) -+bool Sandbox::Initialize(sandbox::mojom::Sandbox sandbox_type) { -+ return SandboxFreeBSD::GetInstance()->InitializeSandbox(sandbox_type); -+} -+#endif // defined(OS_FREEBSD) -+ - #if defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) bool Sandbox::Initialize(sandbox::mojom::Sandbox sandbox_type, SandboxLinux::PreSandboxHook hook, -@@ -90,6 +100,8 @@ bool Sandbox::IsProcessSandboxed() { - base::android::MethodID::Get<base::android::MethodID::TYPE_STATIC>( - env, process_class.obj(), "isIsolated", "()Z"); - return env->CallStaticBooleanMethod(process_class.obj(), is_isolated); -+#elif defined(OS_FREEBSD) -+ return SandboxFreeBSD::GetInstance()->IsSandboxed(); - #elif defined(OS_FUCHSIA) - // TODO(https://crbug.com/1071420): Figure out what to do here. Process - // launching controls the sandbox and there are no ambient capabilities, so + const SandboxLinux::Options& options) { |