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

Side by Side Diff: content/common/sandbox_init_win.cc

Issue 868253011: Make chrome.exe built with ASan/Win work with sandbox enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more EXPECT turned into ASSERT Created 5 years, 10 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
OLDNEW
1 // Copyright (c) 2012 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_win.h" 9 #include "content/common/sandbox_win.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "sandbox/win/src/sandbox.h" 11 #include "sandbox/win/src/sandbox.h"
12 #include "sandbox/win/src/sandbox_types.h" 12 #include "sandbox/win/src/sandbox_types.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 bool InitializeSandbox(sandbox::SandboxInterfaceInfo* sandbox_info) { 16 bool InitializeSandbox(sandbox::SandboxInterfaceInfo* sandbox_info) {
17 const base::CommandLine& command_line = 17 const base::CommandLine& command_line =
18 *base::CommandLine::ForCurrentProcess(); 18 *base::CommandLine::ForCurrentProcess();
19 sandbox::BrokerServices* broker_services = sandbox_info->broker_services; 19 sandbox::BrokerServices* broker_services = sandbox_info->broker_services;
20 if (broker_services) { 20 if (broker_services) {
21 if (!InitBrokerServices(broker_services)) 21 if (!InitBrokerServices(broker_services))
22 return false; 22 return false;
23 23
24 // IMPORTANT: This piece of code needs to run as early as possible in the 24 // IMPORTANT: This piece of code needs to run as early as possible in the
25 // process because it will initialize the sandbox broker, which requires the 25 // process because it will initialize the sandbox broker, which requires the
26 // process to swap its window station. During this time all the UI will be 26 // process to swap its window station. During this time all the UI will be
27 // broken. This has to run before threads and windows are created. 27 // broken. This has to run before threads and windows are created.
28 if (!command_line.HasSwitch(switches::kNoSandbox)) { 28 if (!command_line.HasSwitch(switches::kNoSandbox)) {
29 #if defined(ADDRESS_SANITIZER) && defined(OS_WIN)
30 LOG(FATAL) << "AddressSanitizer for Windows doesn't support sandboxing "
31 "yet (http://crbug.com/382867). "
32 "Please rerun with sandbox disabled.";
33 #endif
34 // Precreate the desktop and window station used by the renderers. 29 // Precreate the desktop and window station used by the renderers.
35 sandbox::TargetPolicy* policy = broker_services->CreatePolicy(); 30 sandbox::TargetPolicy* policy = broker_services->CreatePolicy();
36 sandbox::ResultCode result = policy->CreateAlternateDesktop(true); 31 sandbox::ResultCode result = policy->CreateAlternateDesktop(true);
37 CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result); 32 CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result);
38 policy->Release(); 33 policy->Release();
39 } 34 }
40 return true; 35 return true;
41 } 36 }
42 37
43 if (command_line.HasSwitch(switches::kNoSandbox)) 38 if (command_line.HasSwitch(switches::kNoSandbox))
44 return true; 39 return true;
45 40
46 sandbox::TargetServices* target_services = sandbox_info->target_services; 41 sandbox::TargetServices* target_services = sandbox_info->target_services;
47 return InitTargetServices(target_services); 42 return InitTargetServices(target_services);
48 } 43 }
49 44
50 } // namespace content 45 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698