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

Unified Diff: content/common/sandbox_init_linux.cc

Issue 10786023: Remove the seccomp filter disable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased and removed unused includes. Created 8 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_init_linux.cc
diff --git a/content/common/sandbox_init_linux.cc b/content/common/sandbox_init_linux.cc
index c76fbc81d08d84c88a82f5a6f988098020cbf460..a67a784232aa70bcd6c856baf2546384bbab83da 100644
--- a/content/common/sandbox_init_linux.cc
+++ b/content/common/sandbox_init_linux.cc
@@ -27,10 +27,8 @@
#include <vector>
#include "base/command_line.h"
-#include "base/environment.h"
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "content/public/common/content_switches.h"
#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
@@ -405,18 +403,6 @@ bool ShouldDisableSandbox(const CommandLine& command_line,
return true;
}
- if (!IsChromeOS()) {
- // On non ChromeOS we never enable the sandbox AT ALL unless
- // CHROME_ENABLE_SECCOMP is in the environment.
- // TODO(jorgelo): remove this when seccomp BPF is included
- // in an upstream release Linux kernel.
- static const char kEnableSeccomp[] = "CHROME_ENABLE_SECCOMP";
- scoped_ptr<base::Environment> env(base::Environment::Create());
-
- if (!env->HasVar(kEnableSeccomp))
- return true;
- }
-
if (process_type == switches::kGpuProcess) {
// The GPU sandbox is disabled by default in ChromeOS, enabled by default on
// generic Linux.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698