Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
diff --git a/sandbox/win/BUILD.gn b/sandbox/win/BUILD.gn
index 3c5bca6..69e88d4 100644
--- a/sandbox/win/BUILD.gn
+++ b/sandbox/win/BUILD.gn
@@ -1,285 +1,285 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("sandbox") {
- sources = [
- "src/acl.cc",
- "src/acl.h",
- "src/app_container.cc",
- "src/app_container.h",
- "src/broker_services.cc",
- "src/broker_services.h",
- "src/crosscall_client.h",
- "src/crosscall_params.h",
- "src/crosscall_server.cc",
- "src/crosscall_server.h",
- "src/eat_resolver.cc",
- "src/eat_resolver.h",
- "src/filesystem_dispatcher.cc",
- "src/filesystem_dispatcher.h",
- "src/filesystem_interception.cc",
- "src/filesystem_interception.h",
- "src/filesystem_policy.cc",
- "src/filesystem_policy.h",
- "src/handle_closer.cc",
- "src/handle_closer.h",
- "src/handle_closer_agent.cc",
- "src/handle_closer_agent.h",
- "src/handle_dispatcher.cc",
- "src/handle_dispatcher.h",
- "src/handle_interception.cc",
- "src/handle_interception.h",
- "src/handle_policy.cc",
- "src/handle_policy.h",
- "src/handle_table.cc",
- "src/handle_table.h",
- "src/interception.cc",
- "src/interception.h",
- "src/interception_agent.cc",
- "src/interception_agent.h",
- "src/interception_internal.h",
- "src/interceptors.h",
- "src/internal_types.h",
- "src/ipc_tags.h",
- "src/job.cc",
- "src/job.h",
- "src/named_pipe_dispatcher.cc",
- "src/named_pipe_dispatcher.h",
- "src/named_pipe_interception.cc",
- "src/named_pipe_interception.h",
- "src/named_pipe_policy.cc",
- "src/named_pipe_policy.h",
- "src/nt_internals.h",
- "src/policy_broker.cc",
- "src/policy_broker.h",
- "src/policy_engine_opcodes.cc",
- "src/policy_engine_opcodes.h",
- "src/policy_engine_params.h",
- "src/policy_engine_processor.cc",
- "src/policy_engine_processor.h",
- "src/policy_low_level.cc",
- "src/policy_low_level.h",
- "src/policy_params.h",
- "src/policy_target.cc",
- "src/policy_target.h",
- "src/process_mitigations.cc",
- "src/process_mitigations.h",
- "src/process_thread_dispatcher.cc",
- "src/process_thread_dispatcher.h",
- "src/process_thread_interception.cc",
- "src/process_thread_interception.h",
- "src/process_thread_policy.cc",
- "src/process_thread_policy.h",
- "src/registry_dispatcher.cc",
- "src/registry_dispatcher.h",
- "src/registry_interception.cc",
- "src/registry_interception.h",
- "src/registry_policy.cc",
- "src/registry_policy.h",
- "src/resolver.cc",
- "src/resolver.h",
- "src/restricted_token_utils.cc",
- "src/restricted_token_utils.h",
- "src/restricted_token.cc",
- "src/restricted_token.h",
- "src/sandbox_factory.h",
- "src/sandbox_globals.cc",
- "src/sandbox_nt_types.h",
- "src/sandbox_nt_util.cc",
- "src/sandbox_nt_util.h",
- "src/sandbox_policy_base.cc",
- "src/sandbox_policy_base.h",
- "src/sandbox_policy.h",
- "src/sandbox_types.h",
- "src/sandbox_utils.cc",
- "src/sandbox_utils.h",
- "src/sandbox.cc",
- "src/sandbox.h",
- "src/security_level.h",
- "src/service_resolver.cc",
- "src/service_resolver.h",
- "src/shared_handles.cc",
- "src/shared_handles.h",
- "src/sharedmem_ipc_client.cc",
- "src/sharedmem_ipc_client.h",
- "src/sharedmem_ipc_server.cc",
- "src/sharedmem_ipc_server.h",
- "src/sid.cc",
- "src/sid.h",
- "src/sync_dispatcher.cc",
- "src/sync_dispatcher.h",
- "src/sync_interception.cc",
- "src/sync_interception.h",
- "src/sync_policy.cc",
- "src/sync_policy.h",
- "src/target_interceptions.cc",
- "src/target_interceptions.h",
- "src/target_process.cc",
- "src/target_process.h",
- "src/target_services.cc",
- "src/target_services.h",
- "src/win_utils.cc",
- "src/win_utils.h",
- "src/win2k_threadpool.cc",
- "src/win2k_threadpool.h",
- "src/window.cc",
- "src/window.h",
- ]
-
- if (cpu_arch == "x64" ){
- sources += [
- "src/interceptors_64.cc",
- "src/interceptors_64.h",
- "src/resolver_64.cc",
- "src/service_resolver_64.cc",
- "src/Wow64_64.cc",
- ]
- } else if (cpu_arch == "x86") {
- sources += [
- "src/resolver_32.cc",
- "src/service_resolver_32.cc",
- "src/sidestep_resolver.cc",
- "src/sidestep_resolver.h",
- "src/sidestep/ia32_modrm_map.cpp",
- "src/sidestep/ia32_opcode_map.cpp",
- "src/sidestep/mini_disassembler_types.h",
- "src/sidestep/mini_disassembler.cpp",
- "src/sidestep/mini_disassembler.h",
- "src/sidestep/preamble_patcher_with_stub.cpp",
- "src/sidestep/preamble_patcher.h",
- "src/Wow64.cc",
- "src/Wow64.h",
- ]
- }
-
- deps = [
- ":copy_wow_helper",
- "//base",
- ]
-}
-
-if (cpu_arch == "x86") {
- # Make a target that copies the wow_helper files to the out dir.
- #
- # TODO(brettw) we can probably just build this now that we have proper
- # toolchain support.
- copy("copy_wow_helper") {
- sources = [
- "wow_helper/wow_helper.exe",
- "wow_helper/wow_helper.pdb",
- ]
- outputs = [ "$root_out_dir/{{source_file_part}}" ]
- }
-}
-
-test("sbox_integration_tests") {
- sources = [
- "src/app_container_test.cc",
- "src/file_policy_test.cc",
- "src/handle_inheritance_test.cc",
- "src/handle_policy_test.cc",
- "tests/integration_tests/integration_tests_test.cc",
- "src/handle_closer_test.cc",
- "src/integrity_level_test.cc",
- "src/ipc_ping_test.cc",
- "src/named_pipe_policy_test.cc",
- "src/policy_target_test.cc",
- "src/process_mitigations_test.cc",
- "src/process_policy_test.cc",
- "src/registry_policy_test.cc",
- "src/sync_policy_test.cc",
- "src/sync_policy_test.h",
- "src/unload_dll_test.cc",
- "tests/common/controller.cc",
- "tests/common/controller.h",
- "tests/common/test_utils.cc",
- "tests/common/test_utils.h",
- "tests/integration_tests/integration_tests.cc",
- ]
-
- deps = [
- ":sandbox",
- "//testing/gtest",
- ]
-}
-
-test("sbox_validation_tests") {
- sources = [
- "tests/common/controller.cc",
- "tests/common/controller.h",
- "tests/validation_tests/unit_tests.cc",
- "tests/validation_tests/commands.cc",
- "tests/validation_tests/commands.h",
- "tests/validation_tests/suite.cc",
- ]
-
- deps = [
- ":sandbox",
- "//testing/gtest",
- ]
-}
-
-test("sbox_unittests") {
- sources = [
- "src/app_container_unittest.cc",
- "src/interception_unittest.cc",
- "src/service_resolver_unittest.cc",
- "src/restricted_token_unittest.cc",
- "src/job_unittest.cc",
- "src/sid_unittest.cc",
- "src/policy_engine_unittest.cc",
- "src/policy_low_level_unittest.cc",
- "src/policy_opcodes_unittest.cc",
- "src/ipc_unittest.cc",
- "src/threadpool_unittest.cc",
- "src/win_utils_unittest.cc",
- "tests/common/test_utils.cc",
- "tests/common/test_utils.h",
- "tests/unit_tests/unit_tests.cc",
- ]
-
- deps = [
- ":sandbox",
- "//testing/gtest",
- ]
-}
-
-test("sandbox_poc") {
- sources = [
- "sandbox_poc/main_ui_window.cc",
- "sandbox_poc/main_ui_window.h",
- "sandbox_poc/resource.h",
- "sandbox_poc/sandbox.cc",
- "sandbox_poc/sandbox.h",
- "sandbox_poc/sandbox.ico",
- "sandbox_poc/sandbox.rc",
- ]
-
- configs -= [ "//build/config/win:console" ]
- configs += [ "//build/config/win:windowed" ]
-
- libs = [ "comctl32.lib" ]
-
- deps = [
- ":sandbox",
- ":pocdll",
- ]
-}
-
-shared_library("pocdll") {
- sources = [
- "sandbox_poc/pocdll/exports.h",
- "sandbox_poc/pocdll/fs.cc",
- "sandbox_poc/pocdll/handles.cc",
- "sandbox_poc/pocdll/invasive.cc",
- "sandbox_poc/pocdll/network.cc",
- "sandbox_poc/pocdll/pocdll.cc",
- "sandbox_poc/pocdll/processes_and_threads.cc",
- "sandbox_poc/pocdll/registry.cc",
- "sandbox_poc/pocdll/spyware.cc",
- "sandbox_poc/pocdll/utils.h",
- ]
-
- defines = [ "POCDLL_EXPORTS" ]
-}
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("sandbox") {
+ sources = [
+ "src/acl.cc",
+ "src/acl.h",
+ "src/app_container.cc",
+ "src/app_container.h",
+ "src/broker_services.cc",
+ "src/broker_services.h",
+ "src/crosscall_client.h",
+ "src/crosscall_params.h",
+ "src/crosscall_server.cc",
+ "src/crosscall_server.h",
+ "src/eat_resolver.cc",
+ "src/eat_resolver.h",
+ "src/filesystem_dispatcher.cc",
+ "src/filesystem_dispatcher.h",
+ "src/filesystem_interception.cc",
+ "src/filesystem_interception.h",
+ "src/filesystem_policy.cc",
+ "src/filesystem_policy.h",
+ "src/handle_closer.cc",
+ "src/handle_closer.h",
+ "src/handle_closer_agent.cc",
+ "src/handle_closer_agent.h",
+ "src/handle_dispatcher.cc",
+ "src/handle_dispatcher.h",
+ "src/handle_interception.cc",
+ "src/handle_interception.h",
+ "src/handle_policy.cc",
+ "src/handle_policy.h",
+ "src/handle_table.cc",
+ "src/handle_table.h",
+ "src/interception.cc",
+ "src/interception.h",
+ "src/interception_agent.cc",
+ "src/interception_agent.h",
+ "src/interception_internal.h",
+ "src/interceptors.h",
+ "src/internal_types.h",
+ "src/ipc_tags.h",
+ "src/job.cc",
+ "src/job.h",
+ "src/named_pipe_dispatcher.cc",
+ "src/named_pipe_dispatcher.h",
+ "src/named_pipe_interception.cc",
+ "src/named_pipe_interception.h",
+ "src/named_pipe_policy.cc",
+ "src/named_pipe_policy.h",
+ "src/nt_internals.h",
+ "src/policy_broker.cc",
+ "src/policy_broker.h",
+ "src/policy_engine_opcodes.cc",
+ "src/policy_engine_opcodes.h",
+ "src/policy_engine_params.h",
+ "src/policy_engine_processor.cc",
+ "src/policy_engine_processor.h",
+ "src/policy_low_level.cc",
+ "src/policy_low_level.h",
+ "src/policy_params.h",
+ "src/policy_target.cc",
+ "src/policy_target.h",
+ "src/process_mitigations.cc",
+ "src/process_mitigations.h",
+ "src/process_thread_dispatcher.cc",
+ "src/process_thread_dispatcher.h",
+ "src/process_thread_interception.cc",
+ "src/process_thread_interception.h",
+ "src/process_thread_policy.cc",
+ "src/process_thread_policy.h",
+ "src/registry_dispatcher.cc",
+ "src/registry_dispatcher.h",
+ "src/registry_interception.cc",
+ "src/registry_interception.h",
+ "src/registry_policy.cc",
+ "src/registry_policy.h",
+ "src/resolver.cc",
+ "src/resolver.h",
+ "src/restricted_token_utils.cc",
+ "src/restricted_token_utils.h",
+ "src/restricted_token.cc",
+ "src/restricted_token.h",
+ "src/sandbox_factory.h",
+ "src/sandbox_globals.cc",
+ "src/sandbox_nt_types.h",
+ "src/sandbox_nt_util.cc",
+ "src/sandbox_nt_util.h",
+ "src/sandbox_policy_base.cc",
+ "src/sandbox_policy_base.h",
+ "src/sandbox_policy.h",
+ "src/sandbox_types.h",
+ "src/sandbox_utils.cc",
+ "src/sandbox_utils.h",
+ "src/sandbox.cc",
+ "src/sandbox.h",
+ "src/security_level.h",
+ "src/service_resolver.cc",
+ "src/service_resolver.h",
+ "src/shared_handles.cc",
+ "src/shared_handles.h",
+ "src/sharedmem_ipc_client.cc",
+ "src/sharedmem_ipc_client.h",
+ "src/sharedmem_ipc_server.cc",
+ "src/sharedmem_ipc_server.h",
+ "src/sid.cc",
+ "src/sid.h",
+ "src/sync_dispatcher.cc",
+ "src/sync_dispatcher.h",
+ "src/sync_interception.cc",
+ "src/sync_interception.h",
+ "src/sync_policy.cc",
+ "src/sync_policy.h",
+ "src/target_interceptions.cc",
+ "src/target_interceptions.h",
+ "src/target_process.cc",
+ "src/target_process.h",
+ "src/target_services.cc",
+ "src/target_services.h",
+ "src/win_utils.cc",
+ "src/win_utils.h",
+ "src/win2k_threadpool.cc",
+ "src/win2k_threadpool.h",
+ "src/window.cc",
+ "src/window.h",
+ ]
+
+ if (cpu_arch == "x64" ){
+ sources += [
+ "src/interceptors_64.cc",
+ "src/interceptors_64.h",
+ "src/resolver_64.cc",
+ "src/service_resolver_64.cc",
+ "src/Wow64_64.cc",
+ ]
+ } else if (cpu_arch == "x86") {
+ sources += [
+ "src/resolver_32.cc",
+ "src/service_resolver_32.cc",
+ "src/sidestep_resolver.cc",
+ "src/sidestep_resolver.h",
+ "src/sidestep/ia32_modrm_map.cpp",
+ "src/sidestep/ia32_opcode_map.cpp",
+ "src/sidestep/mini_disassembler_types.h",
+ "src/sidestep/mini_disassembler.cpp",
+ "src/sidestep/mini_disassembler.h",
+ "src/sidestep/preamble_patcher_with_stub.cpp",
+ "src/sidestep/preamble_patcher.h",
+ "src/Wow64.cc",
+ "src/Wow64.h",
+ ]
+ }
+
+ deps = [
+ ":copy_wow_helper",
+ "//base",
+ ]
+}
+
+if (cpu_arch == "x86") {
+ # Make a target that copies the wow_helper files to the out dir.
+ #
+ # TODO(brettw) we can probably just build this now that we have proper
+ # toolchain support.
+ copy("copy_wow_helper") {
+ sources = [
+ "wow_helper/wow_helper.exe",
+ "wow_helper/wow_helper.pdb",
+ ]
+ outputs = [ "$root_out_dir/{{source_file_part}}" ]
+ }
+}
+
+test("sbox_integration_tests") {
+ sources = [
+ "src/app_container_test.cc",
+ "src/file_policy_test.cc",
+ "src/handle_inheritance_test.cc",
+ "src/handle_policy_test.cc",
+ "tests/integration_tests/integration_tests_test.cc",
+ "src/handle_closer_test.cc",
+ "src/integrity_level_test.cc",
+ "src/ipc_ping_test.cc",
+ "src/named_pipe_policy_test.cc",
+ "src/policy_target_test.cc",
+ "src/process_mitigations_test.cc",
+ "src/process_policy_test.cc",
+ "src/registry_policy_test.cc",
+ "src/sync_policy_test.cc",
+ "src/sync_policy_test.h",
+ "src/unload_dll_test.cc",
+ "tests/common/controller.cc",
+ "tests/common/controller.h",
+ "tests/common/test_utils.cc",
+ "tests/common/test_utils.h",
+ "tests/integration_tests/integration_tests.cc",
+ ]
+
+ deps = [
+ ":sandbox",
+ "//testing/gtest",
+ ]
+}
+
+test("sbox_validation_tests") {
+ sources = [
+ "tests/common/controller.cc",
+ "tests/common/controller.h",
+ "tests/validation_tests/unit_tests.cc",
+ "tests/validation_tests/commands.cc",
+ "tests/validation_tests/commands.h",
+ "tests/validation_tests/suite.cc",
+ ]
+
+ deps = [
+ ":sandbox",
+ "//testing/gtest",
+ ]
+}
+
+test("sbox_unittests") {
+ sources = [
+ "src/app_container_unittest.cc",
+ "src/interception_unittest.cc",
+ "src/service_resolver_unittest.cc",
+ "src/restricted_token_unittest.cc",
+ "src/job_unittest.cc",
+ "src/sid_unittest.cc",
+ "src/policy_engine_unittest.cc",
+ "src/policy_low_level_unittest.cc",
+ "src/policy_opcodes_unittest.cc",
+ "src/ipc_unittest.cc",
+ "src/threadpool_unittest.cc",
+ "src/win_utils_unittest.cc",
+ "tests/common/test_utils.cc",
+ "tests/common/test_utils.h",
+ "tests/unit_tests/unit_tests.cc",
+ ]
+
+ deps = [
+ ":sandbox",
+ "//testing/gtest",
+ ]
+}
+
+test("sandbox_poc") {
+ sources = [
+ "sandbox_poc/main_ui_window.cc",
+ "sandbox_poc/main_ui_window.h",
+ "sandbox_poc/resource.h",
+ "sandbox_poc/sandbox.cc",
+ "sandbox_poc/sandbox.h",
+ "sandbox_poc/sandbox.ico",
+ "sandbox_poc/sandbox.rc",
+ ]
+
+ configs -= [ "//build/config/win:console" ]
+ configs += [ "//build/config/win:windowed" ]
+
+ libs = [ "comctl32.lib" ]
+
+ deps = [
+ ":sandbox",
+ ":pocdll",
+ ]
+}
+
+shared_library("pocdll") {
+ sources = [
+ "sandbox_poc/pocdll/exports.h",
+ "sandbox_poc/pocdll/fs.cc",
+ "sandbox_poc/pocdll/handles.cc",
+ "sandbox_poc/pocdll/invasive.cc",
+ "sandbox_poc/pocdll/network.cc",
+ "sandbox_poc/pocdll/pocdll.cc",
+ "sandbox_poc/pocdll/processes_and_threads.cc",
+ "sandbox_poc/pocdll/registry.cc",
+ "sandbox_poc/pocdll/spyware.cc",
+ "sandbox_poc/pocdll/utils.h",
+ ]
+
+ defines = [ "POCDLL_EXPORTS" ]
+}
diff --git a/sandbox/win/src/handle_closer_agent.cc b/sandbox/win/src/handle_closer_agent.cc
index be0ffc1..07c6a09 100644
--- a/sandbox/win/src/handle_closer_agent.cc
+++ b/sandbox/win/src/handle_closer_agent.cc
@@ -78,7 +78,7 @@
bool HandleCloserAgent::CloseHandles() {
DWORD handle_count = UINT_MAX;
const int kInvalidHandleThreshold = 100;
- const size_t kHandleOffset = sizeof(HANDLE);
+ const size_t kHandleOffset = 4; // Handles are always a multiple of 4.
if (!::GetProcessHandleCount(::GetCurrentProcess(), &handle_count))
return false;
diff --git a/sandbox/win/src/handle_closer_test.cc b/sandbox/win/src/handle_closer_test.cc
index 8e821ce..2082baa 100644
--- a/sandbox/win/src/handle_closer_test.cc
+++ b/sandbox/win/src/handle_closer_test.cc
@@ -73,7 +73,7 @@
// Brute force the handle table to find what we're looking for.
DWORD handle_count = UINT_MAX;
const int kInvalidHandleThreshold = 100;
- const size_t kHandleOffset = sizeof(HANDLE);
+ const size_t kHandleOffset = 4; // Handles are always a multiple of 4.
HANDLE handle = NULL;
int invalid_count = 0;
base::string16 handle_name;
diff --git a/sandbox/win/src/registry_dispatcher.cc b/sandbox/win/src/registry_dispatcher.cc
index 2a92497..f98d1d3 100644
--- a/sandbox/win/src/registry_dispatcher.cc
+++ b/sandbox/win/src/registry_dispatcher.cc
@@ -63,7 +63,10 @@
if (IPC_NTOPENKEY_TAG == service) {
bool result = INTERCEPT_NT(manager, NtOpenKey, OPEN_KEY_ID, 16);
- if (base::win::GetVersion() >= base::win::VERSION_WIN7)
+ if (base::win::GetVersion() >= base::win::VERSION_WIN7 ||
+ (base::win::GetVersion() == base::win::VERSION_VISTA &&
+ base::win::OSInfo::GetInstance()->version_type() ==
+ base::win::SUITE_SERVER))
result &= INTERCEPT_NT(manager, NtOpenKeyEx, OPEN_KEY_EX_ID, 20);
return result;
}