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

Side by Side Diff: chrome/browser/zygote_main_linux.cc

Issue 3225010: Pull seccomp-sandbox in via DEPS rather than using an in-tree copy... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | chrome/nacl/nacl_main_platform_delegate_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <dlfcn.h> 5 #include <dlfcn.h>
6 #include <fcntl.h> 6 #include <fcntl.h>
7 #include <sys/epoll.h> 7 #include <sys/epoll.h>
8 #include <sys/prctl.h> 8 #include <sys/prctl.h>
9 #include <sys/signal.h> 9 #include <sys/signal.h>
10 #include <sys/socket.h> 10 #include <sys/socket.h>
(...skipping 28 matching lines...) Expand all
39 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
40 #include "chrome/common/main_function_params.h" 40 #include "chrome/common/main_function_params.h"
41 #include "chrome/common/pepper_plugin_registry.h" 41 #include "chrome/common/pepper_plugin_registry.h"
42 #include "chrome/common/process_watcher.h" 42 #include "chrome/common/process_watcher.h"
43 #include "chrome/common/sandbox_methods_linux.h" 43 #include "chrome/common/sandbox_methods_linux.h"
44 44
45 #include "media/base/media.h" 45 #include "media/base/media.h"
46 46
47 #include "skia/ext/SkFontHost_fontconfig_control.h" 47 #include "skia/ext/SkFontHost_fontconfig_control.h"
48 48
49 #include "sandbox/linux/seccomp/sandbox.h" 49 #include "seccompsandbox/sandbox.h"
50 50
51 #include "unicode/timezone.h" 51 #include "unicode/timezone.h"
52 52
53 #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) 53 #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX)
54 // The seccomp sandbox is enabled on all ia32 and x86-64 processor as long as 54 // The seccomp sandbox is enabled on all ia32 and x86-64 processor as long as
55 // we aren't using SELinux. 55 // we aren't using SELinux.
56 #define SECCOMP_SANDBOX 56 #define SECCOMP_SANDBOX
57 #endif 57 #endif
58 58
59 // http://code.google.com/p/chromium/wiki/LinuxZygote 59 // http://code.google.com/p/chromium/wiki/LinuxZygote
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 LOG(INFO) << "Enabling experimental Seccomp sandbox."; 690 LOG(INFO) << "Enabling experimental Seccomp sandbox.";
691 sandbox_flags |= ZygoteHost::kSandboxSeccomp; 691 sandbox_flags |= ZygoteHost::kSandboxSeccomp;
692 } 692 }
693 } 693 }
694 #endif // SECCOMP_SANDBOX 694 #endif // SECCOMP_SANDBOX
695 695
696 Zygote zygote(sandbox_flags); 696 Zygote zygote(sandbox_flags);
697 // This function call can return multiple times, once per fork(). 697 // This function call can return multiple times, once per fork().
698 return zygote.ProcessRequests(); 698 return zygote.ProcessRequests();
699 } 699 }
OLDNEW
« no previous file with comments | « DEPS ('k') | chrome/nacl/nacl_main_platform_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698