[PATCH 0/1] MR7962: ntdll: Also relocate entry point for builtin modules.

[Yuxuan Shui (＠yshui)]

Discovered while I was working on ASan support. ASan shadow memory might be placed where the main
image is normally loaded, forcing it to relocate. `virtual_map_module` handles this correctly but
`virtual_map_builtin_module` doesn't.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7962

[PATCH 1/1] ntdll: Also relocate entry point for builtin modules.

[Yuxuan Shui]

From: Yuxuan Shui <yshui(a)codeweavers.com>

Discovered while I was working on ASan support. ASan shadow memory might be placed where the main
image is normally loaded, forcing it to relocate. `virtual_map_module` handles this correctly but
`virtual_map_builtin_module` doesn't.
---
 dlls/ntdll/unix/virtual.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 202894750a0..e4512dc0d0e 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -3797,6 +3797,8 @@ NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size
         status = virtual_map_image( mapping, module, size, shared_file, limit_low, limit_high, 0,
                                     machine, image_info, filename, TRUE );
         virtual_fill_image_information( image_info, info );
+        if (status == STATUS_IMAGE_NOT_AT_BASE)
+            info->TransferAddress = (char *)*module + image_info->entry_point;
     }
 
     if (shared_file) NtClose( shared_file );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7962