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

ntdll: Fix possible deadlock in vectored exception handling.

This commit is contained in:
Krzysztof Nowicki 2010-10-08 20:03:14 +02:00 committed by Alexandre Julliard
parent 12c964be68
commit eb0e82a755
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/ntdll/exception.c
View File

@ -48,14 +48,17 @@ typedef struct
static struct list vectored_handlers = LIST_INIT(vectored_handlers); static struct list vectored_handlers = LIST_INIT(vectored_handlers);
static RTL_CRITICAL_SECTION vectored_handlers_section; static RTL_RWLOCK vectored_handlers_lock;
static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
/**********************************************************************
* exceptions_init
*
* Initialize read/write lock used by the vectored exception handling.
*/
void exceptions_init(void)
{ {
0, 0, &vectored_handlers_section, RtlInitializeResource(&vectored_handlers_lock);
{ &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, }
0, 0, { (DWORD_PTR)(__FILE__ ": vectored_handlers_section") }
};
static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 };
/********************************************************************** /**********************************************************************
* wait_suspend * wait_suspend
@ -162,7 +165,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context )
except_ptrs.ExceptionRecord = rec; except_ptrs.ExceptionRecord = rec;
except_ptrs.ContextRecord = context; except_ptrs.ContextRecord = context;
RtlEnterCriticalSection( &vectored_handlers_section ); RtlAcquireResourceShared( &vectored_handlers_lock, TRUE );
LIST_FOR_EACH( ptr, &vectored_handlers ) LIST_FOR_EACH( ptr, &vectored_handlers )
{ {
VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry );
@ -172,7 +175,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context )
TRACE( "handler at %p returned %x\n", handler->func, ret ); TRACE( "handler at %p returned %x\n", handler->func, ret );
if (ret == EXCEPTION_CONTINUE_EXECUTION) break; if (ret == EXCEPTION_CONTINUE_EXECUTION) break;
} }
RtlLeaveCriticalSection( &vectored_handlers_section ); RtlReleaseResource( &vectored_handlers_lock );
return ret; return ret;
} }
@ -214,10 +217,10 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA
if (handler) if (handler)
{ {
handler->func = func; handler->func = func;
RtlEnterCriticalSection( &vectored_handlers_section ); RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE );
if (first) list_add_head( &vectored_handlers, &handler->entry ); if (first) list_add_head( &vectored_handlers, &handler->entry );
else list_add_tail( &vectored_handlers, &handler->entry ); else list_add_tail( &vectored_handlers, &handler->entry );
RtlLeaveCriticalSection( &vectored_handlers_section ); RtlReleaseResource( &vectored_handlers_lock );
} }
return handler; return handler;
} }
@ -231,7 +234,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler )
struct list *ptr; struct list *ptr;
ULONG ret = FALSE; ULONG ret = FALSE;
RtlEnterCriticalSection( &vectored_handlers_section ); RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE );
LIST_FOR_EACH( ptr, &vectored_handlers ) LIST_FOR_EACH( ptr, &vectored_handlers )
{ {
VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry );
@ -242,7 +245,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler )
break; break;
} }
} }
RtlLeaveCriticalSection( &vectored_handlers_section ); RtlReleaseResource( &vectored_handlers_lock );
if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler );
return ret; return ret;
} }

1
dlls/ntdll/ntdll_misc.h
View File

@ -71,6 +71,7 @@ extern void virtual_init(void);
extern void virtual_init_threading(void); extern void virtual_init_threading(void);
extern void fill_cpu_info(void); extern void fill_cpu_info(void);
extern void heap_set_debug_flags( HANDLE handle ); extern void heap_set_debug_flags( HANDLE handle );
extern void exceptions_init(void);
/* server support */ /* server support */
extern timeout_t server_start_time; extern timeout_t server_start_time;

1
dlls/ntdll/thread.c
View File

@ -296,6 +296,7 @@ HANDLE thread_init(void)
user_shared_data->TickCountMultiplier = 1 << 24; user_shared_data->TickCountMultiplier = 1 << 24;
fill_cpu_info(); fill_cpu_info();
exceptions_init();
return exe_file; return exe_file;
} }