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

ntdll: Hold fd_cache_section while removing and closing handles. 

Otherwise, it's possible for the old handle to be re-added to the cache between
removing and closing it.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-03-22 23:04:29 -05:00 committed by Alexandre Julliard
parent 64cfcc1c62
commit d144890c88
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/ntdll/unix/server.c
View File

@ -1692,8 +1692,9 @@ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process )
NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE dest_process, HANDLE *dest, NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE dest_process, HANDLE *dest,
ACCESS_MASK access, ULONG attributes, ULONG options ) ACCESS_MASK access, ULONG attributes, ULONG options )
{ {
sigset_t sigset;
NTSTATUS ret; NTSTATUS ret;
int fd; int fd = -1;
if ((options & DUPLICATE_CLOSE_SOURCE) && source_process != NtCurrentProcess()) if ((options & DUPLICATE_CLOSE_SOURCE) && source_process != NtCurrentProcess())
{ {
@ -1716,13 +1717,12 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE
return result.dup_handle.status; return result.dup_handle.status;
} }
server_enter_uninterrupted_section( &fd_cache_mutex, &sigset );
/* always remove the cached fd; if the server request fails we'll just /* always remove the cached fd; if the server request fails we'll just
* retrieve it again */ * retrieve it again */
if (options & DUPLICATE_CLOSE_SOURCE) if (options & DUPLICATE_CLOSE_SOURCE)
{
fd = remove_fd_from_cache( source ); fd = remove_fd_from_cache( source );
if (fd != -1) close( fd );
}
SERVER_START_REQ( dup_handle ) SERVER_START_REQ( dup_handle )
{ {
@ -1738,6 +1738,10 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE
} }
} }
SERVER_END_REQ; SERVER_END_REQ;
server_leave_uninterrupted_section( &fd_cache_mutex, &sigset );
if (fd != -1) close( fd );
return ret; return ret;
} }
@ -1747,12 +1751,16 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE
*/ */
NTSTATUS WINAPI NtClose( HANDLE handle ) NTSTATUS WINAPI NtClose( HANDLE handle )
{ {
sigset_t sigset;
HANDLE port; HANDLE port;
NTSTATUS ret; NTSTATUS ret;
int fd;
server_enter_uninterrupted_section( &fd_cache_mutex, &sigset );
/* always remove the cached fd; if the server request fails we'll just /* always remove the cached fd; if the server request fails we'll just
* retrieve it again */ * retrieve it again */
int fd = remove_fd_from_cache( handle ); fd = remove_fd_from_cache( handle );
SERVER_START_REQ( close_handle ) SERVER_START_REQ( close_handle )
{ {
@ -1760,6 +1768,9 @@ NTSTATUS WINAPI NtClose( HANDLE handle )
ret = wine_server_call( req ); ret = wine_server_call( req );
} }
SERVER_END_REQ; SERVER_END_REQ;
server_leave_uninterrupted_section( &fd_cache_mutex, &sigset );
if (fd != -1) close( fd ); if (fd != -1) close( fd );
if (ret != STATUS_INVALID_HANDLE || !handle) return ret; if (ret != STATUS_INVALID_HANDLE || !handle) return ret;