Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TCPIP]

Browse source 
- Use pool tagging

svn path=/trunk/; revision=72184
This commit is contained in:
Thomas Faber 2016-08-10 11:19:59 +00:00
parent 0439f525d3
commit 079e405958
4 changed files with 46 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
reactos/drivers/network/tcpip/datalink/lan.c
View file

@ -138,8 +138,9 @@ GetPacketTypeFromNdisPacket(PLAN_ADAPTER Adapter,
ULONG BytesCopied; ULONG BytesCopied;
NDIS_STATUS Status; NDIS_STATUS Status;
HeaderBuffer = ExAllocatePool(NonPagedPool, HeaderBuffer = ExAllocatePoolWithTag(NonPagedPool,
Adapter->HeaderSize); Adapter->HeaderSize,
HEADER_TAG);
if (!HeaderBuffer) if (!HeaderBuffer)
return NDIS_STATUS_RESOURCES; return NDIS_STATUS_RESOURCES;
@ -151,7 +152,7 @@ GetPacketTypeFromNdisPacket(PLAN_ADAPTER Adapter,
if (BytesCopied != Adapter->HeaderSize) if (BytesCopied != Adapter->HeaderSize)
{ {
/* Runt frame */ /* Runt frame */
ExFreePool(HeaderBuffer); ExFreePoolWithTag(HeaderBuffer, HEADER_TAG);
TI_DbgPrint(DEBUG_DATALINK, ("Runt frame (size %d).\n", BytesCopied)); TI_DbgPrint(DEBUG_DATALINK, ("Runt frame (size %d).\n", BytesCopied));
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
} }
@ -161,7 +162,7 @@ GetPacketTypeFromNdisPacket(PLAN_ADAPTER Adapter,
BytesCopied, BytesCopied,
PacketType); PacketType);
ExFreePool(HeaderBuffer); ExFreePoolWithTag(HeaderBuffer, HEADER_TAG);
return Status; return Status;
} }
@ -607,7 +608,7 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface)
} }
else else
{ {
KeyValueInfo = ExAllocatePool(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR)); KeyValueInfo = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), KEY_VALUE_TAG);
if (!KeyValueInfo) if (!KeyValueInfo)
{ {
ZwClose(ParameterHandle); ZwClose(ParameterHandle);
@ -696,6 +697,7 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface)
} }
} }
ExFreePoolWithTag(KeyValueInfo, KEY_VALUE_TAG);
ZwClose(ParameterHandle); ZwClose(ParameterHandle);
} }
@ -823,7 +825,7 @@ VOID NTAPI ProtocolStatus(
if (!Adapter->Context) if (!Adapter->Context)
return; return;
Context = ExAllocatePool(NonPagedPool, sizeof(RECONFIGURE_CONTEXT)); Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(RECONFIGURE_CONTEXT), CONTEXT_TAG);
if (!Context) if (!Context)
return; return;
@ -836,7 +838,7 @@ VOID NTAPI ProtocolStatus(
if (Adapter->State == LAN_STATE_STARTED) if (Adapter->State == LAN_STATE_STARTED)
{ {
ExFreePool(Context); ExFreePoolWithTag(Context, CONTEXT_TAG);
return; return;
} }
@ -848,7 +850,7 @@ VOID NTAPI ProtocolStatus(
if (Adapter->State == LAN_STATE_STOPPED) if (Adapter->State == LAN_STATE_STOPPED)
{ {
ExFreePool(Context); ExFreePoolWithTag(Context, CONTEXT_TAG);
return; return;
} }
@ -859,7 +861,7 @@ VOID NTAPI ProtocolStatus(
Adapter->OldState = Adapter->State; Adapter->OldState = Adapter->State;
Adapter->State = LAN_STATE_RESETTING; Adapter->State = LAN_STATE_RESETTING;
/* Nothing else to do here */ /* Nothing else to do here */
ExFreePool(Context); ExFreePoolWithTag(Context, CONTEXT_TAG);
return; return;
case NDIS_STATUS_RESET_END: case NDIS_STATUS_RESET_END:
@ -869,13 +871,13 @@ VOID NTAPI ProtocolStatus(
default: default:
DbgPrint("Unhandled status: %x", GeneralStatus); DbgPrint("Unhandled status: %x", GeneralStatus);
ExFreePool(Context); ExFreePoolWithTag(Context, CONTEXT_TAG);
return; return;
} }
/* Queue the work item */ /* Queue the work item */
if (!ChewCreate(ReconfigureAdapterWorker, Context)) if (!ChewCreate(ReconfigureAdapterWorker, Context))
ExFreePool(Context); ExFreePoolWithTag(Context, CONTEXT_TAG);
} }
VOID NTAPI ProtocolStatusComplete(NDIS_HANDLE NdisBindingContext) VOID NTAPI ProtocolStatusComplete(NDIS_HANDLE NdisBindingContext)
@ -1108,8 +1110,8 @@ static NTSTATUS ReadStringFromRegistry( HANDLE RegHandle,
UnicodeString.MaximumLength = Information->DataLength; UnicodeString.MaximumLength = Information->DataLength;
String->Buffer = String->Buffer =
(PWCHAR)ExAllocatePool( NonPagedPool, (PWCHAR)ExAllocatePoolWithTag( NonPagedPool,
UnicodeString.MaximumLength + sizeof(WCHAR) ); UnicodeString.MaximumLength + sizeof(WCHAR), REG_STR_TAG );
if( !String->Buffer ) return STATUS_NO_MEMORY; if( !String->Buffer ) return STATUS_NO_MEMORY;
@ -1135,9 +1137,9 @@ NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst,
BOOLEAN Deallocate) { BOOLEAN Deallocate) {
NTSTATUS Status; NTSTATUS Status;
UNICODE_STRING Ustr = *ResultFirst; UNICODE_STRING Ustr = *ResultFirst;
PWSTR new_string = ExAllocatePool PWSTR new_string = ExAllocatePoolWithTag
(PagedPool, (PagedPool,
(ResultFirst->Length + Second->Length + sizeof(WCHAR))); (ResultFirst->Length + Second->Length + sizeof(WCHAR)), TEMP_STRING_TAG);
if( !new_string ) { if( !new_string ) {
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
} }
@ -1150,7 +1152,7 @@ NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst,
new_string[ResultFirst->Length / sizeof(WCHAR)] = 0; new_string[ResultFirst->Length / sizeof(WCHAR)] = 0;
Status = RtlCreateUnicodeString(ResultFirst,new_string) ? Status = RtlCreateUnicodeString(ResultFirst,new_string) ?
STATUS_SUCCESS : STATUS_NO_MEMORY; STATUS_SUCCESS : STATUS_NO_MEMORY;
ExFreePool(new_string); ExFreePoolWithTag(new_string, TEMP_STRING_TAG);
return Status; return Status;
} }
@ -1213,7 +1215,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
NTSTATUS Status; NTSTATUS Status;
ULONG i; ULONG i;
KEY_BASIC_INFORMATION *Kbio = KEY_BASIC_INFORMATION *Kbio =
ExAllocatePool(NonPagedPool, sizeof(KEY_BASIC_INFORMATION)); ExAllocatePoolWithTag(NonPagedPool, sizeof(KEY_BASIC_INFORMATION), KBIO_TAG);
ULONG KbioLength = sizeof(KEY_BASIC_INFORMATION), ResultLength; ULONG KbioLength = sizeof(KEY_BASIC_INFORMATION), ResultLength;
RtlInitUnicodeString( DeviceDesc, NULL ); RtlInitUnicodeString( DeviceDesc, NULL );
@ -1228,7 +1230,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
if( !NT_SUCCESS(Status) ) { if( !NT_SUCCESS(Status) ) {
TI_DbgPrint(DEBUG_DATALINK,("Couldn't open Enum key %wZ: %x\n", TI_DbgPrint(DEBUG_DATALINK,("Couldn't open Enum key %wZ: %x\n",
&EnumKeyName, Status)); &EnumKeyName, Status));
ExFreePool( Kbio ); ExFreePoolWithTag( Kbio, KBIO_TAG );
return Status; return Status;
} }
@ -1237,9 +1239,9 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
Kbio, KbioLength, &ResultLength ); Kbio, KbioLength, &ResultLength );
if( Status == STATUS_BUFFER_TOO_SMALL || Status == STATUS_BUFFER_OVERFLOW ) { if( Status == STATUS_BUFFER_TOO_SMALL || Status == STATUS_BUFFER_OVERFLOW ) {
ExFreePool( Kbio ); ExFreePoolWithTag( Kbio, KBIO_TAG );
KbioLength = ResultLength; KbioLength = ResultLength;
Kbio = ExAllocatePool( NonPagedPool, KbioLength ); Kbio = ExAllocatePoolWithTag( NonPagedPool, KbioLength, KBIO_TAG );
if( !Kbio ) { if( !Kbio ) {
TI_DbgPrint(DEBUG_DATALINK,("Failed to allocate memory\n")); TI_DbgPrint(DEBUG_DATALINK,("Failed to allocate memory\n"));
ZwClose( EnumKey ); ZwClose( EnumKey );
@ -1252,7 +1254,7 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
if( !NT_SUCCESS(Status) ) { if( !NT_SUCCESS(Status) ) {
TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i));
ZwClose( EnumKey ); ZwClose( EnumKey );
ExFreePool( Kbio ); ExFreePoolWithTag( Kbio, KBIO_TAG );
return Status; return Status;
} }
} }
@ -1266,14 +1268,14 @@ static NTSTATUS FindDeviceDescForAdapter( PUNICODE_STRING Name,
( &EnumKeyName, &TargetKeyName, Name, DeviceDesc ); ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc );
if( NT_SUCCESS(Status) ) { if( NT_SUCCESS(Status) ) {
ZwClose( EnumKey ); ZwClose( EnumKey );
ExFreePool( Kbio ); ExFreePoolWithTag( Kbio, KBIO_TAG );
return Status; return Status;
} else Status = STATUS_SUCCESS; } else Status = STATUS_SUCCESS;
} }
} }
ZwClose( EnumKey ); ZwClose( EnumKey );
ExFreePool( Kbio ); ExFreePoolWithTag( Kbio, KBIO_TAG );
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }

9
reactos/drivers/network/tcpip/include/tags.h
View file

@ -35,3 +35,12 @@
#define OSK_SMALL_TAG 'SKSO' #define OSK_SMALL_TAG 'SKSO'
#define LAN_ADAPTER_TAG ' NAL' #define LAN_ADAPTER_TAG ' NAL'
#define WQ_CONTEXT_TAG 'noCW' #define WQ_CONTEXT_TAG 'noCW'
#define ROUTE_ENTRY_TAG 'erCT'
#define OUT_DATA_TAG 'doCT'
#define ARP_ENTRY_TAG 'raCT'
#define KBIO_TAG 'ikCT'
#define TEMP_STRING_TAG 'tsCT'
#define CONTEXT_TAG 'xcCT'
#define KEY_VALUE_TAG 'vkCT'
#define HEADER_TAG 'rhCT'
#define REG_STR_TAG 'srCT'

8
reactos/drivers/network/tcpip/tcpip/iinfo.c
View file

@ -35,7 +35,7 @@ TDI_STATUS InfoTdiQueryGetInterfaceMIB(TDIEntityID ID,
("Getting IFEntry MIB (IF %08x LA %08x) (%04x:%d)\n", ("Getting IFEntry MIB (IF %08x LA %08x) (%04x:%d)\n",
Interface, IF, ID.tei_entity, ID.tei_instance)); Interface, IF, ID.tei_entity, ID.tei_instance));
OutData = ExAllocatePool( NonPagedPool, FIELD_OFFSET(IFEntry, if_descr[MAX_ADAPTER_DESCRIPTION_LENGTH + 1])); OutData = ExAllocatePoolWithTag( NonPagedPool, FIELD_OFFSET(IFEntry, if_descr[MAX_ADAPTER_DESCRIPTION_LENGTH + 1]), OUT_DATA_TAG );
if( !OutData ) return TDI_NO_RESOURCES; /* Out of memory */ if( !OutData ) return TDI_NO_RESOURCES; /* Out of memory */
@ -95,7 +95,7 @@ TDI_STATUS InfoTdiQueryGetInterfaceMIB(TDIEntityID ID,
ID.tei_entity, ID.tei_instance, Size)); ID.tei_entity, ID.tei_instance, Size));
Status = InfoCopyOut( (PCHAR)OutData, Size, Buffer, BufferSize ); Status = InfoCopyOut( (PCHAR)OutData, Size, Buffer, BufferSize );
ExFreePool( OutData ); ExFreePoolWithTag( OutData, OUT_DATA_TAG );
TI_DbgPrint(DEBUG_INFO,("Returning %x\n", Status)); TI_DbgPrint(DEBUG_INFO,("Returning %x\n", Status));
@ -113,14 +113,14 @@ TDI_STATUS InfoTdiQueryGetArptableMIB(TDIEntityID ID,
if (MemSize != 0) if (MemSize != 0)
{ {
ArpEntries = ExAllocatePool( NonPagedPool, MemSize ); ArpEntries = ExAllocatePoolWithTag( NonPagedPool, MemSize, ARP_ENTRY_TAG );
if( !ArpEntries ) return STATUS_NO_MEMORY; if( !ArpEntries ) return STATUS_NO_MEMORY;
NBCopyNeighbors( Interface, ArpEntries ); NBCopyNeighbors( Interface, ArpEntries );
Status = InfoCopyOut( (PVOID)ArpEntries, MemSize, Buffer, BufferSize ); Status = InfoCopyOut( (PVOID)ArpEntries, MemSize, Buffer, BufferSize );
ExFreePool( ArpEntries ); ExFreePoolWithTag( ArpEntries, ARP_ENTRY_TAG );
} }
else else
{ {

16
reactos/drivers/network/tcpip/tcpip/ninfo.c
View file

@ -29,15 +29,15 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF, PNDIS_BUFFER Buffer, PUI
if (RtCount == 0) if (RtCount == 0)
return InfoCopyOut(NULL, 0, NULL, BufferSize); return InfoCopyOut(NULL, 0, NULL, BufferSize);
RouteEntries = ExAllocatePool( NonPagedPool, Size ); RouteEntries = ExAllocatePoolWithTag( NonPagedPool, Size, ROUTE_ENTRY_TAG );
RtCurrent = RouteEntries; RtCurrent = RouteEntries;
RCache = ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ); RCache = ExAllocatePoolWithTag( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount, FIB_TAG );
RCacheCur = RCache; RCacheCur = RCache;
if( !RCache || !RouteEntries ) { if( !RCache || !RouteEntries ) {
if( RCache ) ExFreePool( RCache ); if( RCache ) ExFreePoolWithTag( RCache, FIB_TAG );
if( RouteEntries ) ExFreePool( RouteEntries ); if( RouteEntries ) ExFreePoolWithTag( RouteEntries, ROUTE_ENTRY_TAG );
return TDI_NO_RESOURCES; return TDI_NO_RESOURCES;
} }
@ -87,8 +87,8 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF, PNDIS_BUFFER Buffer, PUI
Status = InfoCopyOut( (PCHAR)RouteEntries, Size, Buffer, BufferSize ); Status = InfoCopyOut( (PCHAR)RouteEntries, Size, Buffer, BufferSize );
ExFreePool( RouteEntries ); ExFreePoolWithTag( RouteEntries, ROUTE_ENTRY_TAG );
ExFreePool( RCache ); ExFreePoolWithTag( RCache, FIB_TAG );
TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status));
@ -122,7 +122,7 @@ TDI_STATUS InfoTdiQueryGetAddrTable(TDIEntityID ID,
return TDI_INVALID_PARAMETER; return TDI_INVALID_PARAMETER;
} }
IPEntry = ExAllocatePool(NonPagedPool, sizeof(IPADDR_ENTRY)); IPEntry = ExAllocatePoolWithTag(NonPagedPool, sizeof(IPADDR_ENTRY), IP_ADDRESS_TAG);
if (!IPEntry) if (!IPEntry)
{ {
TcpipReleaseSpinLock(&EntityListLock, OldIrql); TcpipReleaseSpinLock(&EntityListLock, OldIrql);
@ -147,7 +147,7 @@ TDI_STATUS InfoTdiQueryGetAddrTable(TDIEntityID ID,
InfoCopyOut((PCHAR)IPEntry, sizeof(IPADDR_ENTRY), InfoCopyOut((PCHAR)IPEntry, sizeof(IPADDR_ENTRY),
Buffer, BufferSize); Buffer, BufferSize);
ExFreePool(IPEntry); ExFreePoolWithTag(IPEntry, IP_ADDRESS_TAG);
return TDI_SUCCESS; return TDI_SUCCESS;
} }