diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-07-29 01:27:40 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-07-29 01:27:40 +0200 |
commit | bad6caeb82edd0e22bdbcfa1ca544a5805109e14 (patch) | |
tree | 653e9a40390d7c6e1f34a3ade107809323ab3433 /tun/wintun/memmod/memmod_windows.go | |
parent | c89f5ca665bdab39cdc695c171e0eedd6baf03e8 (diff) | |
download | wireguard-go-bad6caeb82edd0e22bdbcfa1ca544a5805109e14.tar.gz wireguard-go-bad6caeb82edd0e22bdbcfa1ca544a5805109e14.zip |
memmod: fix protected delayed load the right way
The reason this was failing before is that dloadsup.h's
DloadObtainSection was doing a linear search of sections to find which
header corresponds with the IMAGE_DELAYLOAD_DESCRIPTOR section, and we
were stupidly overwriting the VirtualSize field, so the linear search
wound up matching the .text section, which then it found to not be
marked writable and failed with FAST_FAIL_DLOAD_PROTECTION_FAILURE.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'tun/wintun/memmod/memmod_windows.go')
-rw-r--r-- | tun/wintun/memmod/memmod_windows.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tun/wintun/memmod/memmod_windows.go b/tun/wintun/memmod/memmod_windows.go index 6eb022d..59450e7 100644 --- a/tun/wintun/memmod/memmod_windows.go +++ b/tun/wintun/memmod/memmod_windows.go @@ -166,6 +166,7 @@ func (module *Module) finalizeSections() error { sectionData.address = uintptr(sections[0].PhysicalAddress()) | imageOffset sectionData.alignedAddress = alignDown(sectionData.address, uintptr(module.headers.OptionalHeader.SectionAlignment)) sectionData.size = module.realSectionSize(§ions[0]) + sections[0].SetVirtualSize(uint32(sectionData.size)) sectionData.characteristics = sections[0].Characteristics // Loop through all sections and change access flags. @@ -173,6 +174,7 @@ func (module *Module) finalizeSections() error { sectionAddress := uintptr(sections[i].PhysicalAddress()) | imageOffset alignedAddress := alignDown(sectionAddress, uintptr(module.headers.OptionalHeader.SectionAlignment)) sectionSize := module.realSectionSize(§ions[i]) + sections[i].SetVirtualSize(uint32(sectionSize)) // Combine access flags of all sections that share a page. // TODO: We currently share flags of a trailing large section with the page of a first small section. This should be optimized. if sectionData.alignedAddress == alignedAddress || sectionData.address+sectionData.size > alignedAddress { @@ -491,15 +493,6 @@ func LoadLibrary(data []byte) (module *Module, err error) { return } - // Disable protected delayed load for now. TODO: We should support this properly at some point. - if IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG < module.headers.OptionalHeader.NumberOfRvaAndSizes { - directory := module.headerDirectory(IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG) - if directory.Size != 0 && directory.VirtualAddress != 0 { - loadConfig := (*IMAGE_LOAD_CONFIG_DIRECTORY)(a2p(module.codeBase + uintptr(directory.VirtualAddress))) - loadConfig.GuardFlags &^= IMAGE_GUARD_PROTECT_DELAYLOAD_IAT - } - } - // Mark memory pages depending on section headers and release sections that are marked as "discardable". err = module.finalizeSections() if err != nil { |