Use NtCurrentTeb() in GetStackStart() to fix 64-bit Wine on macOS
When running 64-bit Windows binaries on macOS using Wine, there is a conflict between macOS's use of GS to point to pthread thread-specific data, and Windows' use of GS to point to the TEB. Apple has reserved some TSD slots for use by Wine to store commonly-used TEB members (such as 0x30, the 'Self' pointer to the TEB). But, other direct GS accesses by Windows programs (such as to 'StackBase') will return macOS pthread data rather than the TEB member. This was causing 64-bit Chrome to crash on macOS under Wine. Using NtCurrentTeb() gets the 'Self' pointer first, then dereferences it to access the correct 'StackBase', fixing the crash. This turns GetStackStart() from one instruction into two. Crashpad also uses NtCurrentTeb(). The 32-bit change isn't needed, but is just for consistency. Bug: 1121842 Change-Id: Id794030eb22b292530865f940bef8f0705bfd542 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380425 Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by:Bruce Dawson <brucedawson@chromium.org> Reviewed-by:
Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#802648}
Showing
Please register or sign in to comment