snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

setupapi: Revise DrvInfoDetailData struct size calculation

Browse source 
Go adds trailing padding to DrvInfoDetailData struct in GOARCH=386 which
confuses SetupAPI expecting exactly sizeof(SP_DRVINFO_DETAIL_DATA).

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-04-18 10:37:04 +02:00
parent e0a8c22aa6
commit 5811447b38
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tun/wintun/setupapi/setupapi_windows.go
View file

@ -155,7 +155,10 @@ func SetupDiGetDriverInfoDetail(deviceInfoSet DevInfo, deviceInfoData *DevInfoDa
var bufLen uint32 var bufLen uint32
data := (*DrvInfoDetailData)(unsafe.Pointer(&buf[0])) data := (*DrvInfoDetailData)(unsafe.Pointer(&buf[0]))
data.size = uint32(unsafe.Sizeof(*data))
// unsafe.Sizeof(data) >= sizeof(SP_DRVINFO_DETAIL_DATA) due to Go trailing padding. SetupAPI expects exactly sizeof(SP_DRVINFO_DETAIL_DATA).
sizeAPI := unsafe.Offsetof(data.hardwareID) + unsafe.Sizeof(data.hardwareID)
data.size = uint32(sizeAPI)
err := setupDiGetDriverInfoDetail(deviceInfoSet, deviceInfoData, driverInfoData, data, bufCapacity, &bufLen) err := setupDiGetDriverInfoDetail(deviceInfoSet, deviceInfoData, driverInfoData, data, bufCapacity, &bufLen)
if err == nil { if err == nil {
@ -168,7 +171,7 @@ func SetupDiGetDriverInfoDetail(deviceInfoSet DevInfo, deviceInfoData *DevInfoDa
// The buffer was too small. Now that we got the required size, create another one big enough and retry. // The buffer was too small. Now that we got the required size, create another one big enough and retry.
buf := make([]byte, bufLen) buf := make([]byte, bufLen)
data := (*DrvInfoDetailData)(unsafe.Pointer(&buf[0])) data := (*DrvInfoDetailData)(unsafe.Pointer(&buf[0]))
data.size = uint32(unsafe.Sizeof(*data)) data.size = uint32(sizeAPI)
err = setupDiGetDriverInfoDetail(deviceInfoSet, deviceInfoData, driverInfoData, data, bufLen, &bufLen) err = setupDiGetDriverInfoDetail(deviceInfoSet, deviceInfoData, driverInfoData, data, bufLen, &bufLen)
if err == nil { if err == nil {

3
tun/wintun/setupapi/types_windows.go
View file

@ -28,6 +28,7 @@ const (
// Define maximum string length constants // Define maximum string length constants
// //
const ( const (
ANYSIZE_ARRAY = 1
LINE_LEN = 256 // Windows 9x-compatible maximum for displayable strings coming from a device INF. LINE_LEN = 256 // Windows 9x-compatible maximum for displayable strings coming from a device INF.
MAX_INF_STRING_LENGTH = 4096 // Actual maximum size of an INF string (including string substitutions). MAX_INF_STRING_LENGTH = 4096 // Actual maximum size of an INF string (including string substitutions).
MAX_INF_SECTION_NAME_LENGTH = 255 // For Windows 9x compatibility, INF section names should be constrained to 32 characters. MAX_INF_SECTION_NAME_LENGTH = 255 // For Windows 9x compatibility, INF section names should be constrained to 32 characters.
@ -378,7 +379,7 @@ type DrvInfoDetailData struct {
sectionName [LINE_LEN]uint16 sectionName [LINE_LEN]uint16
infFileName [windows.MAX_PATH]uint16 infFileName [windows.MAX_PATH]uint16
drvDescription [LINE_LEN]uint16 drvDescription [LINE_LEN]uint16
hardwareID [1]uint16 hardwareID [ANYSIZE_ARRAY]uint16
} }
func (data *DrvInfoDetailData) GetSectionName() string { func (data *DrvInfoDetailData) GetSectionName() string {