Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Unified Diff: content/renderer/renderer_main_platform_delegate_android.cc

Issue 180783019: [Android] Define a baseline seccomp-bpf sandbox policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move to //content Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/content_common.gypi ('K') | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main_platform_delegate_android.cc
diff --git a/content/renderer/renderer_main_platform_delegate_android.cc b/content/renderer/renderer_main_platform_delegate_android.cc
index 4a19706360269bd76526fc348869c5c37775a198..2f9a1a04f9b538530cfc593c0b7387864016fd29 100644
--- a/content/renderer/renderer_main_platform_delegate_android.cc
+++ b/content/renderer/renderer_main_platform_delegate_android.cc
@@ -3,15 +3,45 @@
// found in the LICENSE file.
#include "content/renderer/renderer_main_platform_delegate.h"
+
+#include "base/command_line.h"
#include "base/logging.h"
+#include "base/rand_util.h"
+#include "base/sys_info.h"
+#include "content/common/android/sandbox_bpf_base_policy_android.h"
+#include "content/public/common/content_switches.h"
+#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
+#include "third_party/skia/include/ports/SkFontConfigInterface.h"
+#include "v8/include/v8.h"
#ifdef ENABLE_VTUNE_JIT_INTERFACE
-#include "content/public/common/content_switches.h"
#include "v8/src/third_party/vtune/v8-vtune.h"
#endif
namespace content {
+namespace {
+
+bool GenerateEntropy(unsigned char* buffer, size_t length) {
+ base::RandBytes(buffer, length);
+ return true;
+}
+
+void PreSandboxWarmUp() {
+ base::RandUint64();
+
+ base::SysInfo::AmountOfPhysicalMemory();
+ base::SysInfo::MaxSharedMemorySize();
+ base::SysInfo::NumberOfProcessors();
+
+ v8::V8::SetEntropySource(&GenerateEntropy);
+ v8::V8::Initialize();
+
+ SkFontConfigInterface::GetSingletonDirectInterface();
+}
+
+} // namespace
+
RendererMainPlatformDelegate::RendererMainPlatformDelegate(
const MainFunctionParams& parameters)
: parameters_(parameters) {
@@ -36,7 +66,20 @@ bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
}
bool RendererMainPlatformDelegate::EnableSandbox() {
- return true;
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableAndroidSeccompBPF)) {
+ return true;
+ }
+
+ PreSandboxWarmUp();
+
+ sandbox::SandboxBPF sandbox;
jln (very slow on Chromium) 2014/03/31 22:57:43 I would rather not duplicate this. Could you use
Robert Sesek 2014/04/08 20:33:45 StartSandboxWithExternalPolicy() will call through
jln (very slow on Chromium) 2014/04/09 05:11:07 I'm on the fence (we could add a parameter to Star
+ sandbox.SetSandboxPolicy(new SandboxBPFBasePolicyAndroid());
+ sandbox.StartSandbox();
+ bool enabled = sandbox.SupportsSeccompSandbox(-1) ==
+ sandbox::SandboxBPF::STATUS_ENABLED;
jln (very slow on Chromium) 2014/03/31 22:57:43 Let's try and fix StartSandbox() to return a bool
Robert Sesek 2014/04/08 20:33:45 Done.
+ CHECK(enabled);
+ return enabled;
}
void RendererMainPlatformDelegate::RunSandboxTests(bool no_sandbox) {
« content/content_common.gypi ('K') | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698