[windows] Use windows.NewLazySystemDLL to (possibly) prevent DLL hija…

…cking Might be useless because of https://docs.microsoft.com/en-us/windows/desktop/dlls/dynamic-link-library-search-order#search-order-for-desktop-applications but better be safe than sorry. Ref: #570 (comment)
shirou · Aug 18, 2018 · ef54649 · ef54649
1 parent 68ff0e2
commit ef54649
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/common/common_windows.go b/internal/common/common_windows.go
@@ -47,10 +47,10 @@ const (
 )
 
 var (
-	Modkernel32 = windows.NewLazyDLL("kernel32.dll")
-	ModNt       = windows.NewLazyDLL("ntdll.dll")
-	ModPdh      = windows.NewLazyDLL("pdh.dll")
-	ModPsapi    = windows.NewLazyDLL("psapi.dll")
+	Modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
+	ModNt       = windows.NewLazySystemDLL("ntdll.dll")
+	ModPdh      = windows.NewLazySystemDLL("pdh.dll")
+	ModPsapi    = windows.NewLazySystemDLL("psapi.dll")
 
 	ProcGetSystemTimes           = Modkernel32.NewProc("GetSystemTimes")
 	ProcNtQuerySystemInformation = ModNt.NewProc("NtQuerySystemInformation")

diff --git a/net/net_windows.go b/net/net_windows.go
@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	modiphlpapi             = windows.NewLazyDLL("iphlpapi.dll")
+	modiphlpapi             = windows.NewLazySystemDLL("iphlpapi.dll")
 	procGetExtendedTCPTable = modiphlpapi.NewProc("GetExtendedTcpTable")
 	procGetExtendedUDPTable = modiphlpapi.NewProc("GetExtendedUdpTable")
 )

diff --git a/process/process_windows.go b/process/process_windows.go
@@ -25,7 +25,7 @@ const (
 )
 
 var (
-	modpsapi                 = windows.NewLazyDLL("psapi.dll")
+	modpsapi                 = windows.NewLazySystemDLL("psapi.dll")
 	procGetProcessMemoryInfo = modpsapi.NewProc("GetProcessMemoryInfo")
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ const ( @@
     )
     var (
-    	modpsapi                 = windows.NewLazyDLL("psapi.dll")
+    	modpsapi                 = windows.NewLazySystemDLL("psapi.dll")
     	procGetProcessMemoryInfo = modpsapi.NewProc("GetProcessMemoryInfo")
     )
@@ Expand Down @@