Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cgutman] 52092: [AFD] - Create an empty TRANSPORT_ADDRESS for the local address when doing an implicit bind so TCP/IP can choose its own local port and address instead of trying to bind the remote...
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 17:08:37 2011 New Revision: 52092 URL: http://svn.reactos.org/svn/reactos?rev=52092&view=rev Log: [AFD] - Create an empty TRANSPORT_ADDRESS for the local address when doing an implicit bind so TCP/IP can choose its own local port and address instead of trying to bind the remote address and port - Fixes another critical networking bug Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/include/tdiconn.h Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Jun 5 17:08:37 2011 @@ -407,7 +407,7 @@ case SOCKET_STATE_CREATED: if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); FCB->LocalAddress = - TaCopyTransportAddress( &ConnectReq->RemoteAddress ); + TaBuildNullTransportAddress( ConnectReq->RemoteAddress.Address[0].AddressType ); if( FCB->LocalAddress ) { Status = WarmSocketForBind( FCB ); Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Sun Jun 5 17:08:37 2011 @@ -38,7 +38,14 @@ } UINT TaLengthOfTransportAddress( PTRANSPORT_ADDRESS Addr ) { - UINT AddrLen = 2 * sizeof( ULONG ) + Addr->Address[0].AddressLength; + UINT AddrLen = sizeof(ULONG) + TaLengthOfAddress(&Addr->Address[0]); + AFD_DbgPrint(MID_TRACE,("AddrLen %x\n", AddrLen)); + return AddrLen; +} + +UINT TaLengthOfTransportAddressByType(UINT AddressType) +{ + UINT AddrLen = sizeof(ULONG) + 2 * sizeof(USHORT) + TdiAddressSizeFromType(AddressType); AFD_DbgPrint(MID_TRACE,("AddrLen %x\n", AddrLen)); return AddrLen; } @@ -75,6 +82,25 @@ TaCopyTransportAddressInPlace( A, OtherAddress ); return A; +} + +PTRANSPORT_ADDRESS TaBuildNullTransportAddress(UINT AddressType) +{ + UINT AddrLen; + PTRANSPORT_ADDRESS A; + + AddrLen = TaLengthOfTransportAddressByType(AddressType); + A = ExAllocatePool(NonPagedPool, AddrLen); + + if (A) + { + A->TAAddressCount = 1; + A->Address[0].AddressLength = TdiAddressSizeFromType(AddressType); + A->Address[0].AddressType = AddressType; + RtlZeroMemory(A->Address[0].Address, A->Address[0].AddressLength); + } + + return A; } NTSTATUS TdiBuildNullConnectionInfoInPlace Modified: trunk/reactos/drivers/network/afd/include/tdiconn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] Sun Jun 5 17:08:37 2011 @@ -7,6 +7,7 @@ typedef VOID *PTDI_CONNECTION_INFO_PAIR; PTRANSPORT_ADDRESS TaCopyTransportAddress( PTRANSPORT_ADDRESS OtherAddress ); +PTRANSPORT_ADDRESS TaBuildNullTransportAddress(UINT AddressType); UINT TaLengthOfAddress( PTA_ADDRESS Addr ); UINT TaLengthOfTransportAddress( PTRANSPORT_ADDRESS Addr ); VOID TaCopyAddressInPlace( PTA_ADDRESS Target, PTA_ADDRESS Source );

1 0

[tkreuzer] 52091: [WIN32K] Add some more debug output in case of a failed ASSERT
by tkreuzer＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: tkreuzer Date: Sun Jun 5 16:00:24 2011 New Revision: 52091 URL: http://svn.reactos.org/svn/reactos?rev=52091&view=rev Log: [WIN32K] Add some more debug output in case of a failed ASSERT Modified: trunk/reactos/subsystems/win32/win32k/objects/gdipool.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdipool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdipool.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdipool.c [iso-8859-1] Sun Jun 5 16:00:24 2011 @@ -139,6 +139,13 @@ /* Get a free section */ ple = pPool->leReadyList.Flink; pSection = CONTAINING_RECORD(ple, GDI_POOL_SECTION, leReadyLink); + if (pSection->cAllocCount >= pPool->cSlotsPerSection) + { + DPRINT1("pSection->cAllocCount=%ld, pPool->cSlotsPerSection=%ld\n", + pSection->cAllocCount, pPool->cSlotsPerSection); + DBG_DUMP_EVENT_LIST(&pPool->slhLog); + ASSERT(FALSE); + } ASSERT(pSection->cAllocCount < pPool->cSlotsPerSection); } else

1 0

[tkreuzer] 52090: [CMAKE] Fix build with msvc
by tkreuzer＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: tkreuzer Date: Sun Jun 5 14:51:31 2011 New Revision: 52090 URL: http://svn.reactos.org/svn/reactos?rev=52090&view=rev Log: [CMAKE] Fix build with msvc Modified: trunk/reactos/msc.cmake Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=52090&r1=520… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Sun Jun 5 14:51:31 2011 @@ -31,13 +31,7 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) -macro(add_pch _target_name _header_filename _src_list) - get_filename_component(FILE ${_header_filename} NAME) - set(_gch_filename "${_target_name}_${FILE}.gch") - add_custom_command( - OUTPUT ${_gch_filename} - COMMAND echo Ignoring precompiled header - DEPENDS ${_header_filename}) +macro(add_pch _target_name _FILE) endmacro() macro(add_linkerflag MODULE _flag)

1 0

[ekohl] 52089: [MSPORTS] Add missing definitions.
by ekohl＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: ekohl Date: Sun Jun 5 13:26:43 2011 New Revision: 52089 URL: http://svn.reactos.org/svn/reactos?rev=52089&view=rev Log: [MSPORTS] Add missing definitions. Modified: trunk/reactos/include/ddk/msports.h Modified: trunk/reactos/include/ddk/msports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/msports.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/msports.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/msports.h [iso-8859-1] Sun Jun 5 13:26:43 2011 @@ -9,11 +9,13 @@ typedef HCOMDB *PHCOMDB; #define HCOMDB_INVALID_HANDLE_VALUE ((HCOMDB)INVALID_HANDLE_VALUE) +/* Limits for ComDBResizeDatabase NewSize */ #define COMDB_MIN_PORTS_ARBITRATED 256 #define COMDB_MAX_PORTS_ARBITRATED 4096 -#define CDB_REPORT_BITS 0x0 -#define CDB_REPORT_BYTES 0x1 +/* ReportType flags for ComDBGetCurrentPortUsage */ +#define CDB_REPORT_BITS 0x0 +#define CDB_REPORT_BYTES 0x1 LONG WINAPI

1 0

[khornicek] 52088: fix build?
by khornicek＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: khornicek Date: Sun Jun 5 12:50:02 2011 New Revision: 52088 URL: http://svn.reactos.org/svn/reactos?rev=52088&view=rev Log: fix build? Modified: trunk/reactos/include/ddk/msports.h Modified: trunk/reactos/include/ddk/msports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/msports.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/msports.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/msports.h [iso-8859-1] Sun Jun 5 12:50:02 2011 @@ -11,6 +11,9 @@ #define COMDB_MIN_PORTS_ARBITRATED 256 #define COMDB_MAX_PORTS_ARBITRATED 4096 + +#define CDB_REPORT_BITS 0x0 +#define CDB_REPORT_BYTES 0x1 LONG WINAPI

1 0

[ekohl] 52087: [MSPORTS] Implement ComDBGetCurrentPortUsage.
by ekohl＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: ekohl Date: Sun Jun 5 12:20:52 2011 New Revision: 52087 URL: http://svn.reactos.org/svn/reactos?rev=52087&view=rev Log: [MSPORTS] Implement ComDBGetCurrentPortUsage. Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Sun Jun 5 12:20:52 2011 @@ -270,8 +270,103 @@ IN DWORD ReportType, OUT LPDWORD MaxPortsReported) { - FIXME("ComDBGetCurrentPortUsage(%p)\n", hComDB); - return ERROR_CALL_NOT_IMPLEMENTED; + PCOMDB pComDB; + DWORD dwBitIndex; + DWORD dwByteIndex; + DWORD dwType; + DWORD dwSize; + PBYTE pBitmap = NULL; + BYTE cMask; + LONG lError = ERROR_SUCCESS; + + if (hComDB == INVALID_HANDLE_VALUE || + hComDB == NULL || + (Buffer == NULL && MaxPortsReported == NULL) || + (ReportType != CDB_REPORT_BITS && ReportType != CDB_REPORT_BYTES)) + return ERROR_INVALID_PARAMETER; + + pComDB = (PCOMDB)hComDB; + + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + + /* Get the required bitmap size */ + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + NULL, + &dwSize); + if (lError != ERROR_SUCCESS) + { + ERR("Failed to query the bitmap size!\n"); + goto done; + } + + /* Allocate the bitmap */ + pBitmap = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + if (pBitmap == NULL) + { + ERR("Failed to allocate the bitmap!\n"); + lError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + /* Read the bitmap */ + lError = RegQueryValueExW(pComDB->hKey, + L"ComDB", + NULL, + &dwType, + pBitmap, + &dwSize); + if (lError != ERROR_SUCCESS) + goto done; + + if (Buffer == NULL) + { + *MaxPortsReported = dwSize * BITS_PER_BYTE; + } + else + { + if (ReportType == CDB_REPORT_BITS) + { + /* Clear the buffer */ + memset(Buffer, 0, BufferSize); + + memcpy(Buffer, + pBitmap, + min(dwSize, BufferSize)); + + if (MaxPortsReported != NULL) + *MaxPortsReported = min(dwSize, BufferSize) * BITS_PER_BYTE; + } + else if (ReportType == CDB_REPORT_BYTES) + { + /* Clear the buffer */ + memset(Buffer, 0, BufferSize); + + for (dwBitIndex = 0; dwBitIndex < min(dwSize * BITS_PER_BYTE, BufferSize); dwBitIndex++) + { + /* Calculate the byte index and a mask for the affected bit */ + dwByteIndex = dwBitIndex / BITS_PER_BYTE; + cMask = 1 << (dwBitIndex % BITS_PER_BYTE); + + if ((pBitmap[dwByteIndex] & cMask) != 0) + Buffer[dwBitIndex] = 1; + } + } + } + +done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + /* Release the bitmap */ + HeapFree(GetProcessHeap(), 0, pBitmap); + + return lError; }

1 0

[cgutman] 52086: [IP/TCPIP] - Add a Next member to CONNECTION_ENDPOINT to allow multiple connections to be associated with a single address file while not overwriting pointers, dereferencing other ...
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 02:16:45 2011 New Revision: 52086 URL: http://svn.reactos.org/svn/reactos?rev=52086&view=rev Log: [IP/TCPIP] - Add a Next member to CONNECTION_ENDPOINT to allow multiple connections to be associated with a single address file while not overwriting pointers, dereferencing other people's connection objects, and causing horrific amounts of memory corruption - Add several sanity checks to prevent this from happening again - Don't try dereference address files and connection endpoints in the free functions; there should be none associated since r52083 (sanity checks ensure this) - Don't hold an extra reference to the address file when creating a listener; this reference is implicit - This should greatly increase reliability of activities that open lots of sockets such as web browsing and running servers on ROS - This also fixes most issues of not releasing a server port when the listener is closed Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Sun Jun 5 02:16:45 2011 @@ -270,6 +270,8 @@ /* Signals */ UINT SignalState; /* Active signals from oskit */ + + struct _CONNECTION_ENDPOINT *Next; /* Next connection in address file list */ } CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT; Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sun Jun 5 02:16:45 2011 @@ -259,7 +259,7 @@ PTDI_REQUEST_KERNEL_ASSOCIATE Parameters; PTRANSPORT_CONTEXT TranContext; PIO_STACK_LOCATION IrpSp; - PCONNECTION_ENDPOINT Connection; + PCONNECTION_ENDPOINT Connection, LastConnection; PFILE_OBJECT FileObject; PADDRESS_FILE AddrFile = NULL; NTSTATUS Status; @@ -340,15 +340,22 @@ /* Add connection endpoint to the address file */ ReferenceObject(Connection); - AddrFile->Connection = Connection; - - /* FIXME: Maybe do this in DispTdiDisassociateAddress() instead? */ + if (AddrFile->Connection == NULL) + AddrFile->Connection = Connection; + else + { + LastConnection = AddrFile->Connection; + while (LastConnection->Next != NULL) + LastConnection = LastConnection->Next; + LastConnection->Next = Connection; + } + ObDereferenceObject(FileObject); UnlockObjectFromDpcLevel(AddrFile); UnlockObject(Connection, OldIrql); - return Status; + return STATUS_SUCCESS; } @@ -425,10 +432,11 @@ * Status of operation */ { - PCONNECTION_ENDPOINT Connection; + PCONNECTION_ENDPOINT Connection, LastConnection; PTRANSPORT_CONTEXT TranContext; PIO_STACK_LOCATION IrpSp; KIRQL OldIrql; + NTSTATUS Status; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -458,19 +466,42 @@ LockObjectAtDpcLevel(Connection->AddressFile); - /* Remove this connection from the address file */ - DereferenceObject(Connection->AddressFile->Connection); - Connection->AddressFile->Connection = NULL; + /* Unlink this connection from the address file */ + if (Connection->AddressFile->Connection == Connection) + { + Connection->AddressFile->Connection = Connection->Next; + DereferenceObject(Connection); + Status = STATUS_SUCCESS; + } + else + { + LastConnection = Connection->AddressFile->Connection; + while (LastConnection->Next != Connection && LastConnection->Next != NULL) + LastConnection = LastConnection->Next; + if (LastConnection->Next == Connection) + { + LastConnection->Next = Connection->Next; + DereferenceObject(Connection); + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } UnlockObjectFromDpcLevel(Connection->AddressFile); - /* Remove the address file from this connection */ - DereferenceObject(Connection->AddressFile); - Connection->AddressFile = NULL; + if (Status == STATUS_SUCCESS) + { + /* Remove the address file from this connection */ + DereferenceObject(Connection->AddressFile); + Connection->AddressFile = NULL; + } UnlockObject(Connection, OldIrql); - return STATUS_SUCCESS; + return Status; } @@ -602,7 +633,6 @@ Status = STATUS_NO_MEMORY; if( NT_SUCCESS(Status) ) { - ReferenceObject(Connection->AddressFile); Connection->AddressFile->Listener->AddressFile = Connection->AddressFile; Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Jun 5 02:16:45 2011 @@ -161,6 +161,9 @@ TI_DbgPrint(MID_TRACE, ("Called.\n")); + /* We should not be associated with a connection here */ + ASSERT(!AddrFile->Connection); + /* Remove address file from the global list */ TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); RemoveEntryList(&AddrFile->ListEntry); @@ -377,17 +380,14 @@ if (!Request->Handle.AddressHandle) return STATUS_INVALID_PARAMETER; LockObject(AddrFile, &OldIrql); - /* We have to close this connection because we started it */ + + /* We have to close this listener because we started it */ if( AddrFile->Listener ) { AddrFile->Listener->AddressFile = NULL; TCPClose( AddrFile->Listener ); } - if( AddrFile->Connection ) - { - AddrFile->Connection->AddressFile = NULL; - DereferenceObject( AddrFile->Connection ); - } + UnlockObject(AddrFile, OldIrql); DereferenceObject(AddrFile); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Jun 5 02:16:45 2011 @@ -666,12 +666,13 @@ KIRQL OldIrql; NTSTATUS Status; PVOID Socket; - PADDRESS_FILE AddressFile = NULL; - PCONNECTION_ENDPOINT AddressConnection = NULL; LockObject(Connection, &OldIrql); Socket = Connection->SocketContext; Connection->SocketContext = NULL; + + /* We should not be associated to an address file at this point */ + ASSERT(!Connection->AddressFile); /* Don't try to close again if the other side closed us already */ if (Socket) @@ -693,27 +694,9 @@ Status = STATUS_SUCCESS; } - if (Connection->AddressFile) - { - LockObjectAtDpcLevel(Connection->AddressFile); - if (Connection->AddressFile->Connection == Connection) - { - AddressConnection = Connection->AddressFile->Connection; - Connection->AddressFile->Connection = NULL; - } - UnlockObjectFromDpcLevel(Connection->AddressFile); - - AddressFile = Connection->AddressFile; - Connection->AddressFile = NULL; - } - UnlockObject(Connection, OldIrql); DereferenceObject(Connection); - if (AddressConnection) - DereferenceObject(AddressConnection); - if (AddressFile) - DereferenceObject(AddressFile); return Status; }

1 0

[akhaldi] 52085: [CMAKE] * Fix unix build. We need to quote the file paths in reactos.dff for cabman to parse them correctly. Dedicated to Arty.
by akhaldi＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: akhaldi Date: Sat Jun 4 23:45:11 2011 New Revision: 52085 URL: http://svn.reactos.org/svn/reactos?rev=52085&view=rev Log: [CMAKE] * Fix unix build. We need to quote the file paths in reactos.dff for cabman to parse them correctly. Dedicated to Arty. Modified: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sat Jun 4 23:45:11 2011 @@ -150,7 +150,11 @@ else() #add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n") + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n") + else() + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${_CD_FILE}\" ${_num}\n") + endif() if(_CD_TARGET) #manage dependency add_dependencies(reactos_cab ${_CD_TARGET})

1 0

[ekohl] 52084: [MSPORTS] Protect the COM database from concurrent access.
by ekohl＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: ekohl Date: Sat Jun 4 21:07:28 2011 New Revision: 52084 URL: http://svn.reactos.org/svn/reactos?rev=52084&view=rev Log: [MSPORTS] Protect the COM database from concurrent access. Modified: trunk/reactos/dll/win32/msports/comdb.c Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Sat Jun 4 21:07:28 2011 @@ -17,6 +17,7 @@ typedef struct _COMDB { + HANDLE hMutex; HKEY hKey; } COMDB, *PCOMDB; @@ -44,6 +45,9 @@ pComDB = (PCOMDB)hComDB; + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + /* Get the required bitmap size */ lError = RegQueryValueExW(pComDB->hKey, L"ComDB", @@ -52,7 +56,10 @@ NULL, &dwSize); if (lError != ERROR_SUCCESS) - return lError; + { + ERR("Failed to query the bitmap size!\n"); + goto done; + } /* Allocate the bitmap */ pBitmap = HeapAlloc(GetProcessHeap(), @@ -61,7 +68,8 @@ if (pBitmap == NULL) { ERR("Failed to allocate the bitmap!\n"); - return lError; + lError = ERROR_NOT_ENOUGH_MEMORY; + goto done; } /* Read the bitmap */ @@ -102,6 +110,10 @@ } done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + /* Release the bitmap */ if (pBitmap != NULL) HeapFree(GetProcessHeap(), 0, pBitmap); @@ -135,6 +147,9 @@ pComDB = (PCOMDB)hComDB; + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + /* Get the required bitmap size */ lError = RegQueryValueExW(pComDB->hKey, L"ComDB", @@ -143,7 +158,10 @@ NULL, &dwSize); if (lError != ERROR_SUCCESS) - return lError; + { + ERR("Failed to query the bitmap size!\n"); + goto done; + } /* Allocate the bitmap */ pBitmap = HeapAlloc(GetProcessHeap(), @@ -152,7 +170,8 @@ if (pBitmap == NULL) { ERR("Failed to allocate the bitmap!\n"); - return lError; + lError = ERROR_NOT_ENOUGH_MEMORY; + goto done; } /* Read the bitmap */ @@ -203,6 +222,10 @@ } done: + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + /* Release the bitmap */ if (pBitmap != NULL) HeapFree(GetProcessHeap(), 0, pBitmap); @@ -218,7 +241,8 @@ TRACE("ComDBClose(%p)\n", hComDB); - if (hComDB == HCOMDB_INVALID_HANDLE_VALUE || hComDB == NULL) + if (hComDB == HCOMDB_INVALID_HANDLE_VALUE || + hComDB == NULL) return ERROR_INVALID_PARAMETER; pComDB = (PCOMDB)hComDB; @@ -226,6 +250,10 @@ /* Close the registry key */ if (pComDB->hKey != NULL) RegCloseKey(pComDB->hKey); + + /* Close the mutex */ + if (pComDB->hMutex != NULL) + CloseHandle(pComDB->hMutex); /* Release the database */ HeapFree(GetProcessHeap(), 0, pComDB); @@ -267,8 +295,24 @@ if (pComDB == NULL) { ERR("Failed to allocate the database!\n"); + *phComDB = HCOMDB_INVALID_HANDLE_VALUE; return ERROR_ACCESS_DENIED; } + + /* Create a mutex to protect the database */ + pComDB->hMutex = CreateMutexW(NULL, + FALSE, + L"ComDBMutex"); + if (pComDB->hMutex == NULL) + { + ERR("Failed to create the mutex!\n"); + HeapFree(GetProcessHeap(), 0, pComDB); + *phComDB = HCOMDB_INVALID_HANDLE_VALUE; + return ERROR_ACCESS_DENIED; + } + + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); /* Create or open the database key */ lError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, @@ -316,11 +360,17 @@ } done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + if (lError != ERROR_SUCCESS) { /* Clean up in case of failure */ if (pComDB->hKey != NULL) RegCloseKey(pComDB->hKey); + + if (pComDB->hMutex != NULL) + CloseHandle(pComDB->hMutex); HeapFree(GetProcessHeap(), 0, pComDB); @@ -361,6 +411,9 @@ pComDB = (PCOMDB)hComDB; + /* Wait for the mutex */ + WaitForSingleObject(pComDB->hMutex, INFINITE); + /* Get the required bitmap size */ lError = RegQueryValueExW(pComDB->hKey, L"ComDB", @@ -369,7 +422,10 @@ NULL, &dwSize); if (lError != ERROR_SUCCESS) - return lError; + { + ERR("Failed to query the bitmap size!\n"); + goto done; + } /* Allocate the bitmap */ pBitmap = HeapAlloc(GetProcessHeap(), @@ -378,7 +434,8 @@ if (pBitmap == NULL) { ERR("Failed to allocate the bitmap!\n"); - return lError; + lError = ERROR_NOT_ENOUGH_MEMORY; + goto done; } /* Read the bitmap */ @@ -416,6 +473,10 @@ dwSize); done:; + /* Release the mutex */ + ReleaseMutex(pComDB->hMutex); + + /* Release the bitmap */ if (pBitmap != NULL) HeapFree(GetProcessHeap(), 0, pBitmap);

1 0

[cgutman] 52083: [AFD] - Disassociate the connection from the address file before closing them
by cgutman＠svn.reactos.org 04 Jun '11

04 Jun '11

Author: cgutman Date: Sat Jun 4 20:31:05 2011 New Revision: 52083 URL: http://svn.reactos.org/svn/reactos?rev=52083&view=rev Log: [AFD] - Disassociate the connection from the address file before closing them Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Jun 4 20:31:05 2011 @@ -460,7 +460,10 @@ ExFreePool( FCB->RemoteAddress ); if( FCB->Connection.Object ) + { + TdiDisassociateAddressFile(FCB->Connection.Object); ObDereferenceObject(FCB->Connection.Object); + } if( FCB->AddressFile.Object ) ObDereferenceObject(FCB->AddressFile.Object); Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sat Jun 4 20:31:05 2011 @@ -420,6 +420,55 @@ return Status; } +NTSTATUS TdiDisassociateAddressFile( + PFILE_OBJECT ConnectionObject) +/* + * FUNCTION: Disassociates a connection endpoint from an address file object + * ARGUMENTS: + * ConnectionObject = Connection endpoint file object + * RETURNS: + * Status of operation + */ +{ + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + KEVENT Event; + PIRP Irp; + + AFD_DbgPrint(MAX_TRACE, ("Called. ConnectionObject (0x%X)\n", ConnectionObject)); + + if (!ConnectionObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n")); + return STATUS_INVALID_PARAMETER; + } + + DeviceObject = IoGetRelatedDeviceObject(ConnectionObject); + if (!DeviceObject) { + AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + return STATUS_INVALID_PARAMETER; + } + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = TdiBuildInternalDeviceControlIrp(TDI_DISASSOCIATE_ADDRESS, /* Sub function */ + DeviceObject, /* Device object */ + ConnectionObject, /* File object */ + &Event, /* Event */ + &Iosb); /* Status */ + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; + + TdiBuildDisassociateAddress(Irp, + DeviceObject, + ConnectionObject, + NULL, + NULL); + + Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); + + return Status; +} NTSTATUS TdiListen ( PIRP *Irp, @@ -1229,7 +1278,7 @@ } Irp = TdiBuildInternalDeviceControlIrp - ( TDI_SEND_DATAGRAM, /* Sub function */ + ( TDI_DISCONNECT, /* Sub function */ DeviceObject, /* Device object */ TransportObject, /* File object */ &Event, /* Event */ Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Jun 4 20:31:05 2011 @@ -360,6 +360,9 @@ HANDLE AddressHandle, PFILE_OBJECT ConnectionObject); +NTSTATUS TdiDisassociateAddressFile( + PFILE_OBJECT ConnectionObject); + NTSTATUS TdiListen ( PIRP *Irp, PFILE_OBJECT ConnectionObject,

1 0

← Newer
1
...
38
39
40
41
42
43
44
45
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011