diff options
| author | jchaffraix@chromium.org <jchaffraix@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 14:40:47 +0000 |
|---|---|---|
| committer | jchaffraix@chromium.org <jchaffraix@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 14:40:47 +0000 |
| commit | a472fb1cfcac3170f798c3ddb72fd1d130160ec7 (patch) | |
| tree | 432dcb0727e872f505db117b1d0cf68575ac4892 /chrome_elf/chrome_elf_main.cc | |
| parent | a259f7f8643bdbf3000a6efcb30ccff13121a756 (diff) | |
| download | chromium_src-a472fb1cfcac3170f798c3ddb72fd1d130160ec7.zip chromium_src-a472fb1cfcac3170f798c3ddb72fd1d130160ec7.tar.gz chromium_src-a472fb1cfcac3170f798c3ddb72fd1d130160ec7.tar.bz2 | |
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
Diffstat (limited to 'chrome_elf/chrome_elf_main.cc')
| -rw-r--r-- | chrome_elf/chrome_elf_main.cc | 14 |
1 files changed, 4 insertions, 10 deletions
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; } |