diff options
| author | Qian Hong <qhong@codeweavers.com> | 2015-10-29 11:17:46 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-10-29 11:17:57 +0300 |
| commit | ff3c4a7d2fd686543140b0d39177c3464d1444e1 (patch) | |
| tree | 2926e13e551a2fcb3be76e8a98338bdadf9e8212 /winsup | |
| parent | e30d78d6850ccbed3bc4e108b4023de852ff884f (diff) | |
Check for correct funtion entry address in munge_threadfunc
* init.cc (munge_threadfunc): Check that we're actually replacing
the correct original function address on the stack.
* ntdll.h (enum _THREADINFOCLASS): Add ThreadQuerySetWin32StartAddress.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/init.cc | 9 | ||||
| -rw-r--r-- | winsup/cygwin/ntdll.h | 3 | ||||
| -rw-r--r-- | winsup/cygwin/release/2.3.0 | 3 |
4 files changed, 18 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index afbe7a2b3..337a1d2d6 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2015-10-29 Qian Hong <qhong@codeweavers.com> + + * init.cc (munge_threadfunc): Check that we're actually replacing + the correct original function address on the stack. + * ntdll.h (enum _THREADINFOCLASS): Add ThreadQuerySetWin32StartAddress. + 2015-08-21 Jon Turney <jon.turney@dronecode.org.uk> * cygwin-cxx.h: Remove execute permissions. diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc index 56d466869..69e66a029 100644 --- a/winsup/cygwin/init.cc +++ b/winsup/cygwin/init.cc @@ -55,12 +55,17 @@ munge_threadfunc () if (threadfunc_ix[0]) { - char *threadfunc = ebp[threadfunc_ix[0]]; + char *threadfunc = NULL; + + NtQueryInformationThread (NtCurrentThread (), + ThreadQuerySetWin32StartAddress, + &threadfunc, sizeof threadfunc, NULL); if (!search_for || threadfunc == search_for) { search_for = NULL; for (i = 0; threadfunc_ix[i]; i++) - ebp[threadfunc_ix[i]] = (char *) threadfunc_fe; + if (!threadfunc || ebp[threadfunc_ix[i]] == threadfunc) + ebp[threadfunc_ix[i]] = (char *) threadfunc_fe; TlsSetValue (_my_oldfunc, threadfunc); } } diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h index 13a131deb..050e8485d 100644 --- a/winsup/cygwin/ntdll.h +++ b/winsup/cygwin/ntdll.h @@ -1162,7 +1162,8 @@ typedef enum _THREADINFOCLASS { ThreadBasicInformation = 0, ThreadTimes = 1, - ThreadImpersonationToken = 5 + ThreadImpersonationToken = 5, + ThreadQuerySetWin32StartAddress = 9 } THREADINFOCLASS, *PTHREADINFOCLASS; /* Checked on 64 bit. */ diff --git a/winsup/cygwin/release/2.3.0 b/winsup/cygwin/release/2.3.0 index 9a44bab47..c6f70aa4b 100644 --- a/winsup/cygwin/release/2.3.0 +++ b/winsup/cygwin/release/2.3.0 @@ -50,3 +50,6 @@ Bug Fixes - Avoid SEGV when handling SIDs with 0 subauthorities. Addresses: https://cygwin.com/ml/cygwin/2015-10/msg00141.html + +- Fix a potential SEGV on (at least) Wine. + Addresses: https://cygwin.com/ml/cygwin/2015-10/msg00018.html |