OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/public/common/sandbox_init.h" | 5 #include "content/public/common/sandbox_init.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "content/common/sandbox_policy.h" | 9 #include "content/common/sandbox_policy.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
11 #include "sandbox/src/sandbox.h" | 11 #include "sandbox/src/sandbox.h" |
12 #include "sandbox/src/sandbox_types.h" | 12 #include "sandbox/src/sandbox_types.h" |
13 | 13 |
14 namespace content { | 14 namespace content { |
15 | 15 |
16 bool InitializeSandbox( | 16 bool InitializeSandbox( |
17 sandbox::SandboxInterfaceInfo* sandbox_info) { | 17 sandbox::SandboxInterfaceInfo* sandbox_info) { |
18 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 18 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
19 std::string process_type = | 19 std::string process_type = |
20 command_line.GetSwitchValueASCII(switches::kProcessType); | 20 command_line.GetSwitchValueASCII(switches::kProcessType); |
21 if (process_type.empty() || process_type == switches::kNaClBrokerProcess) { | 21 if (process_type.empty() || process_type == switches::kNaClBrokerProcess) { |
22 // IMPORTANT: This piece of code needs to run as early as possible in the | 22 // IMPORTANT: This piece of code needs to run as early as possible in the |
23 // process because it will initialize the sandbox broker, which requires the | 23 // process because it will initialize the sandbox broker, which requires the |
24 // process to swap its window station. During this time all the UI will be | 24 // process to swap its window station. During this time all the UI will be |
25 // broken. This has to run before threads and windows are created. | 25 // broken. This has to run before threads and windows are created. |
26 sandbox::BrokerServices* broker_services = sandbox_info->broker_services; | 26 sandbox::BrokerServices* broker_services = sandbox_info->broker_services; |
27 if (broker_services) { | 27 if (broker_services) { |
28 sandbox::InitBrokerServices(broker_services); | 28 if (!sandbox::InitBrokerServices(broker_services)) |
| 29 return false; |
29 if (!command_line.HasSwitch(switches::kNoSandbox)) { | 30 if (!command_line.HasSwitch(switches::kNoSandbox)) { |
30 bool use_winsta = !command_line.HasSwitch( | 31 bool use_winsta = !command_line.HasSwitch( |
31 switches::kDisableAltWinstation); | 32 switches::kDisableAltWinstation); |
32 // Precreate the desktop and window station used by the renderers. | 33 // Precreate the desktop and window station used by the renderers. |
33 sandbox::TargetPolicy* policy = broker_services->CreatePolicy(); | 34 sandbox::TargetPolicy* policy = broker_services->CreatePolicy(); |
34 sandbox::ResultCode result = policy->CreateAlternateDesktop(use_winsta); | 35 sandbox::ResultCode result = policy->CreateAlternateDesktop(use_winsta); |
35 CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result); | 36 CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result); |
36 policy->Release(); | 37 policy->Release(); |
37 } | 38 } |
38 } | 39 } |
(...skipping 11 matching lines...) Expand all Loading... |
50 // The above five process types must be sandboxed unless --no-sandbox | 51 // The above five process types must be sandboxed unless --no-sandbox |
51 // is present in the command line. | 52 // is present in the command line. |
52 if (!target_services) | 53 if (!target_services) |
53 return false; | 54 return false; |
54 } else { | 55 } else { |
55 // Other process types might or might not be sandboxed. | 56 // Other process types might or might not be sandboxed. |
56 // TODO(cpu): clean this mess. | 57 // TODO(cpu): clean this mess. |
57 if (!target_services) | 58 if (!target_services) |
58 return true; | 59 return true; |
59 } | 60 } |
60 return (sandbox::SBOX_ALL_OK == target_services->Init()); | 61 return sandbox::InitTargetServices(target_services); |
61 } | 62 } |
62 | 63 |
63 } // namespace content | 64 } // namespace content |
OLD | NEW |