From a472fb1cfcac3170f798c3ddb72fd1d130160ec7 Mon Sep 17 00:00:00 2001 From: "jchaffraix@chromium.org" Date: Wed, 18 Dec 2013 14:40:47 +0000 Subject: Revert 241548 "Chrome browser process DLL blacklist." This is breaking the Win builders (and the blacklist_test is failing on 64 bits). > Chrome browser process DLL blacklist. > > This patch allows for blocking of module loading in the browser process. > It does not actually prevent any modules from loading. > > BUG=329023 > TEST=chrome_elf_unittests > > Review URL: https://codereview.chromium.org/107663008 TBR=robertshield@chromium.org Review URL: https://codereview.chromium.org/107443008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241568 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_elf/chrome_elf_main.cc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'chrome_elf/chrome_elf_main.cc') diff --git a/chrome_elf/chrome_elf_main.cc b/chrome_elf/chrome_elf_main.cc index 9ad8299..4291430 100644 --- a/chrome_elf/chrome_elf_main.cc +++ b/chrome_elf/chrome_elf_main.cc @@ -6,21 +6,15 @@ #include "chrome_elf/chrome_elf_main.h" -#include "chrome_elf/blacklist/blacklist.h" #include "chrome_elf/ntdll_cache.h" -void SignalChromeElf() { - blacklist::ClearBeacon(); +void InitChromeElf() { + // This method is a no-op which may be called to force a load-time dependency + // on chrome_elf.dll. } BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { - if (reason == DLL_PROCESS_ATTACH) { + if (reason == DLL_PROCESS_ATTACH) InitCache(); - blacklist::Initialize(false); // Don't force, abort if beacon is present. - - // TODO(csharp): Move additions to the DLL blacklist to a sane place. - // blacklist::AddDllToBlacklist(L"foo.dll"); - } - return TRUE; } -- cgit v1.1