Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Receiving happens at dispatch level due to transition lock

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2019-07-02 15:54:35 +00:00
parent 2517fb6659
commit 30d2b6e3a7
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wintun.c
View File

@ -806,7 +806,8 @@ TunDispatchWrite(_Inout_ TUN_CTX *Ctx, _Inout_ IRP *Irp)
} }
TUN_PACKET *Packet = (TUN_PACKET *)BufferPos; TUN_PACKET *Packet = (TUN_PACKET *)BufferPos;
ULONG PacketSize = *(volatile ULONG *)&Packet->Size; /* Packet->Size is controlled by userspace, so don't trust it. */ /* Packet->Size is controlled by userspace, so don't trust it. */
ULONG PacketSize = *(volatile ULONG *)&Packet->Size;
if (PacketSize > TUN_EXCH_MAX_IP_PACKET_SIZE) if (PacketSize > TUN_EXCH_MAX_IP_PACKET_SIZE)
{ {
@ -874,20 +875,17 @@ TunDispatchWrite(_Inout_ TUN_CTX *Ctx, _Inout_ IRP *Irp)
InterlockedExchange(IRP_REFCOUNT(Irp), NblCount); InterlockedExchange(IRP_REFCOUNT(Irp), NblCount);
IoMarkIrpPending(Irp); IoMarkIrpPending(Irp);
if (NblQueue[EtherTypeIndexIPv4].Head) for (EtherTypeIndex Index = EtherTypeIndexStart; Index < EtherTypeIndexEnd; Index++)
{
if (!NblQueue[Index].Head)
continue;
NdisMIndicateReceiveNetBufferLists( NdisMIndicateReceiveNetBufferLists(
Ctx->MiniportAdapterHandle, Ctx->MiniportAdapterHandle,
NblQueue[EtherTypeIndexIPv4].Head, NblQueue[Index].Head,
NDIS_DEFAULT_PORT_NUMBER, NDIS_DEFAULT_PORT_NUMBER,
NblQueue[EtherTypeIndexIPv4].Count, NblQueue[Index].Count,
NDIS_RECEIVE_FLAGS_SINGLE_ETHER_TYPE); NDIS_RECEIVE_FLAGS_SINGLE_ETHER_TYPE | NDIS_RECEIVE_FLAGS_DISPATCH_LEVEL);
if (NblQueue[EtherTypeIndexIPv6].Head) }
NdisMIndicateReceiveNetBufferLists(
Ctx->MiniportAdapterHandle,
NblQueue[EtherTypeIndexIPv6].Head,
NDIS_DEFAULT_PORT_NUMBER,
NblQueue[EtherTypeIndexIPv6].Count,
NDIS_RECEIVE_FLAGS_SINGLE_ETHER_TYPE);
ExReleaseSpinLockShared(&Ctx->TransitionLock, Irql); ExReleaseSpinLockShared(&Ctx->TransitionLock, Irql);
TunCompletePause(Ctx, TRUE); TunCompletePause(Ctx, TRUE);