From 3b772262f70af113e730be8510acaa14f6a2a9b1 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Fri, 21 Oct 2022 11:39:58 -0700
Subject: [PATCH] Bug 41149: Re-enable DLL injection protection in all builds
not just nightlies
---
toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp b/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp
index 5ac3af4559386..a3c6e54da1598 100644
--- a/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp
+++ b/toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp
@@ -576,7 +576,7 @@ continue_loading:
return ret;
}
-#if defined(NIGHTLY_BUILD)
+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)
// Map of specific thread proc addresses we should block. In particular,
// LoadLibrary* APIs which indicate DLL injection
static void* gStartAddressesToBlock[4];
@@ -589,7 +589,7 @@ static bool ShouldBlockThread(void* aStartAddress) {
return false;
}
-#if defined(NIGHTLY_BUILD)
+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)
for (auto p : gStartAddressesToBlock) {
if (p == aStartAddress) {
return true;
@@ -662,7 +662,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) {
}
}
-#if defined(NIGHTLY_BUILD)
+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)
// Populate a list of thread start addresses to block.
HMODULE hKernel = GetModuleHandleW(L"kernel32.dll");
if (hKernel) {
--
GitLab