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

Side by Side Diff: chrome_elf/blacklist/blacklist.cc

Issue 320653003: Add "One Key Theater" DLLs to the browser DLL blacklist. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome_elf/blacklist/blacklist.h" 5 #include "chrome_elf/blacklist/blacklist.h"
6 6
7 #include <assert.h> 7 #include <assert.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "chrome_elf/blacklist/blacklist_interceptions.h" 11 #include "chrome_elf/blacklist/blacklist_interceptions.h"
12 #include "chrome_elf/chrome_elf_constants.h" 12 #include "chrome_elf/chrome_elf_constants.h"
13 #include "chrome_elf/chrome_elf_util.h" 13 #include "chrome_elf/chrome_elf_util.h"
14 #include "chrome_elf/thunk_getter.h" 14 #include "chrome_elf/thunk_getter.h"
15 #include "sandbox/win/src/interception_internal.h" 15 #include "sandbox/win/src/interception_internal.h"
16 #include "sandbox/win/src/internal_types.h" 16 #include "sandbox/win/src/internal_types.h"
17 #include "sandbox/win/src/service_resolver.h" 17 #include "sandbox/win/src/service_resolver.h"
18 18
19 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx 19 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
20 extern "C" IMAGE_DOS_HEADER __ImageBase; 20 extern "C" IMAGE_DOS_HEADER __ImageBase;
21 21
22 namespace blacklist{ 22 namespace blacklist{
23 23
24 const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = { 24 const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = {
25 L"datamngr.dll", // Unknown (suspected adware). 25 L"datamngr.dll", // Unknown (suspected adware).
26 L"hk.dll", // Unknown (keystroke logger). 26 L"hk.dll", // Unknown (keystroke logger).
27 L"libsvn_tsvn32.dll", // TortoiseSVN. 27 L"libsvn_tsvn32.dll", // TortoiseSVN.
28 L"lmrn.dll", // Unknown. 28 L"lmrn.dll", // Unknown.
29 L"activedetect32.dll", // Lenovo One Key Theater.
30 // See crbug.com/379218.
31 L"windowsapihookdll32.dll", // Lenovo One Key Theater.
32 L"activedetect64.dll", // Lenovo One Key Theater.
33 L"windowsapihookdll64.dll", // Lenovo One Key Theater.
29 // Keep this null pointer here to mark the end of the list. 34 // Keep this null pointer here to mark the end of the list.
30 NULL, 35 NULL,
31 }; 36 };
32 37
33 bool g_blocked_dlls[kTroublesomeDllsMaxCount] = {}; 38 bool g_blocked_dlls[kTroublesomeDllsMaxCount] = {};
34 int g_num_blocked_dlls = 0; 39 int g_num_blocked_dlls = 0;
35 40
36 } // namespace blacklist 41 } // namespace blacklist
37 42
38 // Allocate storage for thunks in a page of this module to save on doing 43 // Allocate storage for thunks in a page of this module to save on doing
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 sizeof(g_thunk_storage), 344 sizeof(g_thunk_storage),
340 PAGE_EXECUTE_READ, 345 PAGE_EXECUTE_READ,
341 &old_protect); 346 &old_protect);
342 347
343 RecordSuccessfulThunkSetup(&key); 348 RecordSuccessfulThunkSetup(&key);
344 349
345 return NT_SUCCESS(ret) && page_executable; 350 return NT_SUCCESS(ret) && page_executable;
346 } 351 }
347 352
348 } // namespace blacklist 353 } // namespace blacklist
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698