Finch Blacklist is now added to the Hardcoded blacklist.

chrome_elf/blacklist/blacklist.cc

 // Copyright 2013 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.
 
 #include "chrome_elf/blacklist/blacklist.h"
 
 #include <assert.h>
 #include <string.h>
 
+#include <vector>
+
 #include "base/basictypes.h"
 #include "chrome_elf/blacklist/blacklist_interceptions.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "chrome_elf/chrome_elf_util.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"
 
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
@@ skipping 315 matching lines @@
   g_blacklist_initialized = NT_SUCCESS(ret);
 
   // Mark the thunk storage as executable and prevent any future writes to it.
   page_executable = page_executable && VirtualProtect(&g_thunk_storage,
                                                       sizeof(g_thunk_storage),
                                                       PAGE_EXECUTE_READ,
                                                       &old_protect);
 
   RecordSuccessfulThunkSetup(&key);
 
+  AddDllsFromRegistryToBlacklist();
+
   return NT_SUCCESS(ret) && page_executable;
 }
 
+void AddDllsFromRegistryToBlacklist() {

[csharp, 2014/05/29 20:51:52]

Should this return a boolean to indicate failure or success? 

[krstnmnlsn, 2014/05/30 14:09:13]

Done.

+  HKEY key = NULL;
+  LONG result = ::RegOpenKeyEx(HKEY_CURRENT_USER,
+                                 kRegistryFinchListPath,
+                                 0,
+                                 KEY_QUERY_VALUE | KEY_SET_VALUE,
+                                 &key);
+
+  if (result != ERROR_SUCCESS)
+    return;
+
+  int num_dlls;
+  int longest_name;
+  ::RegQueryInfoKey(key, NULL, NULL, NULL, NULL, NULL, NULL,
+                    reinterpret_cast<DWORD*>(&num_dlls),
+                    reinterpret_cast<DWORD*>(&longest_name), NULL, NULL, NULL);
+
+  // Collect dlls so that we can delete them after the enumeration.
+  std::vector<wchar_t*> dll_names(num_dlls);
+
+  for (int i = 0; i < num_dlls; ++i) {
+    DWORD name_len(longest_name + 1);
+    DWORD value_len;
+    wchar_t* name_buffer = new wchar_t[name_len];
+    result = ::RegEnumValue(key, i, name_buffer, &name_len, NULL, NULL,
+                            NULL, &value_len);
+    name_len = name_len + 1;
+    wchar_t* value_buffer = new wchar_t[value_len+1];
+    result = ::RegEnumValue(key, i, name_buffer, &name_len, NULL, NULL,
+                            reinterpret_cast<BYTE*>(value_buffer), &value_len);
+    value_buffer[value_len] = L'\0';
+
+    if (result == ERROR_SUCCESS) {
+      AddDllToBlacklist(value_buffer);
+    }
+
+    dll_names[i] = name_buffer;
+
+    delete[] value_buffer;
+  }
+
+  for (int i = 0; i < num_dlls; ++i) {
+    ::RegDeleteValue(key, dll_names[i]);
+    delete[] dll_names[i];
+  }
+
+  ::RegCloseKey(key);
+}
+
 }  // namespace blacklist