commit cc9e5940c601a6654bce26946ffed521c63b52e6
author Rafael Cintron <rafael.cintron@microsoft.com> Wed Jun 18 06:14:39 2025 -0700
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 18 06:14:39 2025 -0700
tree a949f71158ce4acf5b95958b130a8eb0db3115d9
parent f896a62cf4188b54b233f4eafbf5992638cd06c6

Always Load KernelBase.dll from System32 directory

Further reduce DLL search order attacks by loading kernel32.dll
from the System32 folder like we currently do for other D3D DLLs.

Change-Id: Ifd8b948cdb2a2679b2299858e54f9f4fe8e39a0a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/247514
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Rafael Cintron <rafael.cintron@microsoft.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

src/dawn/native/d3d/PlatformFunctions.cpp

diff --git a/src/dawn/native/d3d/PlatformFunctions.cpp b/src/dawn/native/d3d/PlatformFunctions.cpp
index 5efe68e..cd51833 100644
--- a/src/dawn/native/d3d/PlatformFunctions.cpp
+++ b/src/dawn/native/d3d/PlatformFunctions.cpp
@@ -110,7 +110,7 @@
     compareObjectHandles = &CompareObjectHandles;
 #else
     std::string error;
-    if (!mKernelBaseLib.Open("kernelbase.dll", &error) ||
+    if (!mKernelBaseLib.OpenSystemLibrary(L"kernelbase.dll", &error) ||
         !mKernelBaseLib.GetProc(&compareObjectHandles, "CompareObjectHandles", &error)) {
         return DAWN_INTERNAL_ERROR(error.c_str());
     }