ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on x86-64. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-09-12 11:31:13 +02:00
parent 4c0f59ddbc
commit 24876bf17e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ntdll/signal_x86_64.c
View File

@ -2829,10 +2829,11 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec
*/ */
static inline DWORD is_privileged_instr( CONTEXT *context ) static inline DWORD is_privileged_instr( CONTEXT *context )
{ {
const BYTE *instr = (BYTE *)context->Rip; BYTE instr[16];
unsigned int prefix_count = 0; unsigned int i, prefix_count = 0;
unsigned int len = virtual_uninterrupted_read_memory( (BYTE *)context->Rip, instr, sizeof(instr) );
for (;;) switch(*instr) for (i = 0; i < len; i++) switch (instr[i])
{ {
/* instruction prefixes */ /* instruction prefixes */
case 0x2e: /* %cs: */ case 0x2e: /* %cs: */
@ -2863,11 +2864,11 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
case 0xf2: /* repne */ case 0xf2: /* repne */
case 0xf3: /* repe */ case 0xf3: /* repe */
if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION; if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION;
instr++;
continue; continue;
case 0x0f: /* extended instruction */ case 0x0f: /* extended instruction */
switch(instr[1]) if (i == len - 1) return 0;
switch (instr[i + 1])
{ {
case 0x06: /* clts */ case 0x06: /* clts */
case 0x08: /* invd */ case 0x08: /* invd */
@ -2899,6 +2900,7 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
default: default:
return 0; return 0;
} }
return 0;
} }