Use NewLazySystemDLL instead of NewLazyDLL (elastic#13234)

The ensures that the code only search for DLLs in the Windows system directory.
jetgeng · Aug 14, 2019 · 0ac717d · 0ac717d
1 parent cfcef45
commit 0ac717d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -86,6 +86,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix seccomp policy preventing some features to function properly on 32bit Linux systems. {issue}12990[12990] {pull}13008[13008]
 - Fix unexpected stops on docker autodiscover when a container is restarted before `cleanup_timeout`. {issue}12962[12962] {pull}13127[13127]
 - Fix install-service.ps1's ability to set Windows service's delay start configuration. {pull}13173[13173]
+- Load DLLs only from Windows system directory. {pull}13234[13234]
 
 *Auditbeat*
 

diff --git a/libbeat/common/file/file_windows.go b/libbeat/common/file/file_windows.go
@@ -35,7 +35,7 @@ type StateOS struct {
 }
 
 var (
-	modkernel32 = windows.NewLazyDLL("kernel32.dll")
+	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
 
 	procGetFileInformationByHandleEx = modkernel32.NewProc("GetFileInformationByHandleEx")
 )

diff --git a/metricbeat/module/system/diskio/diskstat_windows_helper.go b/metricbeat/module/system/diskio/diskstat_windows_helper.go
@@ -24,14 +24,12 @@ import (
 	"syscall"
 	"unsafe"
 
-	windows2 "golang.org/x/sys/windows"
-
-	"github.com/elastic/beats/libbeat/logp"
-
 	"github.com/pkg/errors"
+	"github.com/shirou/gopsutil/disk"
+	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/registry"
 
-	"github.com/shirou/gopsutil/disk"
+	"github.com/elastic/beats/libbeat/logp"
 )
 
 const (
@@ -41,10 +39,9 @@ const (
 )
 
 var (
-	modkernel32                 = syscall.NewLazyDLL("kernel32.dll")
+	modkernel32                 = windows.NewLazySystemDLL("kernel32.dll")
 	procGetLogicalDriveStringsW = modkernel32.NewProc("GetLogicalDriveStringsW")
 	procGetDriveTypeW           = modkernel32.NewProc("GetDriveTypeW")
-	logger                      = logp.NewLogger("diskio")
 )
 
 type logicalDrive struct {
@@ -145,7 +142,7 @@ func enablePerformanceCounters() error {
 		if err = key.SetDWordValue("EnableCounterForIoctl", 1); err != nil {
 			return errors.Errorf("cannot create HKLM:SYSTEM\\CurrentControlSet\\Services\\Partmgr\\EnableCounterForIoctl key in the registry in order to enable the performance counters: %s", err)
 		}
-		logger.Info("The registry key EnableCounterForIoctl at HKLM:SYSTEM\\CurrentControlSet\\Services\\Partmgr has been created in order to enable the performance counters")
+		logp.L().Named("diskio").Info("The registry key EnableCounterForIoctl at HKLM:SYSTEM\\CurrentControlSet\\Services\\Partmgr has been created in order to enable the performance counters")
 	}
 	return nil
 }
@@ -247,7 +244,7 @@ func GetVolumeLabel(path *uint16) (string, error) {
 	lpMaximumComponentLength := uint32(0)
 	lpFileSystemFlags := uint32(0)
 	lpFileSystemNameBuffer := make([]uint16, 256)
-	err := windows2.GetVolumeInformation(
+	err := windows.GetVolumeInformation(
 		path,
 		&lpVolumeNameBuffer[0],
 		uint32(len(lpVolumeNameBuffer)),
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ type StateOS struct { @@
     }
     var (
-    	modkernel32 = windows.NewLazyDLL("kernel32.dll")
+    	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
     	procGetFileInformationByHandleEx = modkernel32.NewProc("GetFileInformationByHandleEx")
     )
@@ Expand Down @@