From 72d2d1b7f043edf5fe4e89a37e60e665dd747626 Mon Sep 17 00:00:00 2001 From: "caitkp@chromium.org" Date: Fri, 7 Mar 2014 22:06:31 +0000 Subject: Revert 255151 "Make chrome_elf use thunks instead of function po..." (Crashy on today's canary) > Make chrome_elf use thunks instead of function pointers. > > 1. Add functionality to ServiceResolverThunk to copy a thunk without patching. > 2. Move chrome_elf thunk-handling code to a common location. > 3. Use a thunk instead of a f'n ptr for redirects. > > BUG=334379 > > Review URL: https://codereview.chromium.org/183833004 TBR=caitkp@chromium.org Review URL: https://codereview.chromium.org/189803007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255703 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_elf/ntdll_cache.cc | 54 ++--------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) (limited to 'chrome_elf/ntdll_cache.cc') diff --git a/chrome_elf/ntdll_cache.cc b/chrome_elf/ntdll_cache.cc index 73b0e11..e550442 100644 --- a/chrome_elf/ntdll_cache.cc +++ b/chrome_elf/ntdll_cache.cc @@ -2,26 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome_elf/ntdll_cache.h" - #include #include -#include "base/basictypes.h" -#include "chrome_elf/thunk_getter.h" -#include "sandbox/win/src/interception_internal.h" -#include "sandbox/win/src/internal_types.h" -#include "sandbox/win/src/service_resolver.h" - -// Allocate storage for thunks in a page of this module to save on doing -// an extra allocation at run time. -#pragma section(".crthunk", read, execute) -__declspec(allocate(".crthunk")) sandbox::ThunkData g_nt_thunk_storage; +#include "chrome_elf/ntdll_cache.h" FunctionLookupTable g_ntdll_lookup; void InitCache() { - HMODULE ntdll_handle = ::GetModuleHandle(sandbox::kNtdllName); + HMODULE ntdll_handle = ::GetModuleHandle(L"ntdll.dll"); // To find the Export Address Table address, we start from the DOS header. // The module handle is actually the address of the header. @@ -59,43 +48,4 @@ void InitCache() { FARPROC func_addr = reinterpret_cast(func + base_addr); g_ntdll_lookup[std::string(name)] = func_addr; } - - const bool kRelaxed = true; - - // Create a thunk via the appropriate ServiceResolver instance. - sandbox::ServiceResolverThunk* thunk = GetThunk(kRelaxed); - - if (thunk) { - BYTE* thunk_storage = reinterpret_cast(&g_nt_thunk_storage); - - // Mark the thunk storage as readable and writeable, since we - // ready to write to it. - DWORD old_protect = 0; - if (!::VirtualProtect(&g_nt_thunk_storage, - sizeof(g_nt_thunk_storage), - PAGE_EXECUTE_READWRITE, - &old_protect)) { - return; - } - - size_t storage_used = 0; - NTSTATUS ret = thunk->CopyThunk(::GetModuleHandle(sandbox::kNtdllName), - "NtCreateFile", - thunk_storage, - sizeof(sandbox::ThunkData), - &storage_used); - delete thunk; - - // Ensure that the pointer to the old function can't be changed. - ::VirtualProtect(&g_nt_thunk_storage, - sizeof(g_nt_thunk_storage), - PAGE_EXECUTE_READ, - &old_protect); - - if (NT_SUCCESS(ret)) { - // Add an entry in the lookup table for the thunk. - g_ntdll_lookup["NtCreateFile"] = - reinterpret_cast(&g_nt_thunk_storage); - } - } } -- cgit v1.1