JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* path.cc (find_fast_cwd_pointer): Allow 'push crit-sect-addr' instead

Browse Source 
of 'mov edi, crit-sect-addr; push edi' and set rcall accordingly.
This commit is contained in:
Corinna Vinschen
2011-10-13 16:47:32 +00:00
parent 40187f9007
commit 76173acf28
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
2011-10-13 Corinna Vinschen <corinna@vinschen.de>
* path.cc (find_fast_cwd_pointer): Allow 'push crit-sect-addr' instead
of 'mov edi, crit-sect-addr; push edi' and set rcall accordingly.
2011-10-13 Corinna Vinschen <corinna@vinschen.de> 2011-10-13 Corinna Vinschen <corinna@vinschen.de>
* path.cc (copy_cwd_str): Move up in file to be accessible from * path.cc (copy_cwd_str): Move up in file to be accessible from

9
winsup/cygwin/path.cc
View File

@@ -3665,9 +3665,13 @@ find_fast_cwd_pointer ()
/* Find first "push edi" instruction. */ /* Find first "push edi" instruction. */
const uint8_t *pushedi = (const uint8_t *) memchr (use_cwd, 0x57, 32); const uint8_t *pushedi = (const uint8_t *) memchr (use_cwd, 0x57, 32);
/* ...which should be followed by "mov edi, crit-sect-addr" then /* ...which should be followed by "mov edi, crit-sect-addr" then
"push edi". */ "push edi", or by just a single "push crit-sect-addr". */
const uint8_t *movedi = pushedi + 1; const uint8_t *movedi = pushedi + 1;
if (movedi[0] != 0xbf || movedi[5] != 0x57) if (movedi[0] == 0xbf && movedi[5] == 0x57)
rcall = movedi + 6;
else if (movedi[0] == 0x68)
rcall = movedi + 5;
else
return NULL; return NULL;
/* Compare the address used for the critical section with the known /* Compare the address used for the critical section with the known
PEB lock as stored in the PEB. */ PEB lock as stored in the PEB. */
@@ -3676,7 +3680,6 @@ find_fast_cwd_pointer ()
return NULL; return NULL;
/* To check we are seeing the right code, we check our expectation that /* To check we are seeing the right code, we check our expectation that
the next instruction is a relative call into RtlEnterCriticalSection. */ the next instruction is a relative call into RtlEnterCriticalSection. */
rcall = movedi + 6;
if (rcall[0] != 0xe8) if (rcall[0] != 0xe8)
return NULL; return NULL;
/* Check that this is a relative call to RtlEnterCriticalSection. */ /* Check that this is a relative call to RtlEnterCriticalSection. */