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

Make error branching more compact

Browse Source 
Signed-off-by: Odd Stranne <odd@mullvad.net>
This commit is contained in:
Odd Stranne 2019-07-04 23:50:00 +02:00 committed by Jason A. Donenfeld
parent 20586e37b2
commit 75e434e3b8
1 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
wintun.c
View File

@ -311,21 +311,19 @@ TunMapUbuffer(_Inout_ TUN_MAPPED_UBUFFER *MappedBuffer, _In_ VOID *UserAddress,
} }
MappedBuffer->Mdl = IoAllocateMdl(UserAddress, Size, FALSE, FALSE, NULL); MappedBuffer->Mdl = IoAllocateMdl(UserAddress, Size, FALSE, FALSE, NULL);
Status = STATUS_INSUFFICIENT_RESOURCES; if (Status = STATUS_INSUFFICIENT_RESOURCES, !MappedBuffer->Mdl)
if (!MappedBuffer->Mdl)
goto err_releasemutex; goto err_releasemutex;
Status = STATUS_INVALID_USER_BUFFER;
try try
{ {
Status = STATUS_INVALID_USER_BUFFER;
MmProbeAndLockPages(MappedBuffer->Mdl, UserMode, IoWriteAccess); MmProbeAndLockPages(MappedBuffer->Mdl, UserMode, IoWriteAccess);
} }
except(EXCEPTION_EXECUTE_HANDLER) { goto err_freemdl; } except(EXCEPTION_EXECUTE_HANDLER) { goto err_freemdl; }
MappedBuffer->KernelAddress = MappedBuffer->KernelAddress =
MmGetSystemAddressForMdlSafe(MappedBuffer->Mdl, NormalPagePriority | MdlMappingNoExecute); MmGetSystemAddressForMdlSafe(MappedBuffer->Mdl, NormalPagePriority | MdlMappingNoExecute);
Status = STATUS_INSUFFICIENT_RESOURCES; if (Status = STATUS_INSUFFICIENT_RESOURCES, !MappedBuffer->KernelAddress)
if (!MappedBuffer->KernelAddress)
goto err_unlockmdl; goto err_unlockmdl;
MappedBuffer->Size = Size; MappedBuffer->Size = Size;
InterlockedExchangePointer(&MappedBuffer->UserAddress, UserAddress); InterlockedExchangePointer(&MappedBuffer->UserAddress, UserAddress);
@ -863,10 +861,11 @@ TunDispatchWrite(_Inout_ TUN_CTX *Ctx, _Inout_ IRP *Irp)
if (Status = STATUS_INVALID_USER_BUFFER, NblCount >= MAXLONG) if (Status = STATUS_INVALID_USER_BUFFER, NblCount >= MAXLONG)
goto cleanup_nbl_queues; goto cleanup_nbl_queues;
TUN_PACKET *Packet = (TUN_PACKET *)BufferPos; TUN_PACKET *Packet = (TUN_PACKET *)BufferPos;
if (Status = STATUS_INVALID_USER_BUFFER, Packet->Size > TUN_EXCH_MAX_IP_PACKET_SIZE) if (Status = STATUS_INVALID_USER_BUFFER, Packet->Size > TUN_EXCH_MAX_IP_PACKET_SIZE)
goto cleanup_nbl_queues; goto cleanup_nbl_queues;
ULONG AlignedPacketSize = TunPacketAlign(sizeof(TUN_PACKET) + Packet->Size); ULONG AlignedPacketSize = TunPacketAlign(sizeof(TUN_PACKET) + Packet->Size);
if (Status = STATUS_INVALID_USER_BUFFER, (BufferEnd - BufferPos < (ptrdiff_t)AlignedPacketSize)) if (Status = STATUS_INVALID_USER_BUFFER, BufferEnd - BufferPos < (ptrdiff_t)AlignedPacketSize)
goto cleanup_nbl_queues; goto cleanup_nbl_queues;
EtherTypeIndex Index; EtherTypeIndex Index;
@ -1014,15 +1013,12 @@ _Use_decl_annotations_
static NTSTATUS static NTSTATUS
TunDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp) TunDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status;
Irp->IoStatus.Information = 0; Irp->IoStatus.Information = 0;
TUN_CTX *Ctx = NdisGetDeviceReservedExtension(DeviceObject); TUN_CTX *Ctx = NdisGetDeviceReservedExtension(DeviceObject);
if (!Ctx) if (Status = STATUS_INVALID_HANDLE, !Ctx)
{
Status = STATUS_INVALID_HANDLE;
goto cleanup_complete_req; goto cleanup_complete_req;
}
IO_STACK_LOCATION *Stack = IoGetCurrentIrpStackLocation(Irp); IO_STACK_LOCATION *Stack = IoGetCurrentIrpStackLocation(Irp);
switch (Stack->MajorFunction) switch (Stack->MajorFunction)
@ -1043,10 +1039,12 @@ TunDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp)
return TunDispatchCreate(Ctx, Irp); return TunDispatchCreate(Ctx, Irp);
case IRP_MJ_CLOSE: case IRP_MJ_CLOSE:
Status = STATUS_SUCCESS;
TunDispatchClose(Ctx, Irp); TunDispatchClose(Ctx, Irp);
break; break;
case IRP_MJ_CLEANUP: case IRP_MJ_CLEANUP:
Status = STATUS_SUCCESS;
for (IRP *PendingIrp; (PendingIrp = IoCsqRemoveNextIrp(&Ctx->Device.ReadQueue.Csq, Stack->FileObject)) != NULL;) for (IRP *PendingIrp; (PendingIrp = IoCsqRemoveNextIrp(&Ctx->Device.ReadQueue.Csq, Stack->FileObject)) != NULL;)
TunCompleteRequest(Ctx, PendingIrp, STATUS_CANCELLED, IO_NO_INCREMENT); TunCompleteRequest(Ctx, PendingIrp, STATUS_CANCELLED, IO_NO_INCREMENT);
break; break;
@ -1201,11 +1199,8 @@ TunInitializeEx(
DeviceObject->Flags &= ~(DO_BUFFERED_IO | DO_DIRECT_IO); DeviceObject->Flags &= ~(DO_BUFFERED_IO | DO_DIRECT_IO);
TUN_CTX *Ctx = NdisGetDeviceReservedExtension(DeviceObject); TUN_CTX *Ctx = NdisGetDeviceReservedExtension(DeviceObject);
if (!Ctx) if (Status = NDIS_STATUS_FAILURE, !Ctx)
{
Status = NDIS_STATUS_FAILURE;
goto cleanup_NdisDeregisterDeviceEx; goto cleanup_NdisDeregisterDeviceEx;
}
DEVICE_OBJECT *FunctionalDeviceObject; DEVICE_OBJECT *FunctionalDeviceObject;
NdisMGetDeviceProperty(MiniportAdapterHandle, NULL, &FunctionalDeviceObject, NULL, NULL, NULL); NdisMGetDeviceProperty(MiniportAdapterHandle, NULL, &FunctionalDeviceObject, NULL, NULL, NULL);
@ -1264,11 +1259,8 @@ TunInitializeEx(
#pragma warning( \ #pragma warning( \
suppress : 6014) /* Leaking memory 'ctx->NBLPool'. Note: 'ctx->NBLPool' is freed in TunHaltEx; or on failure. */ suppress : 6014) /* Leaking memory 'ctx->NBLPool'. Note: 'ctx->NBLPool' is freed in TunHaltEx; or on failure. */
Ctx->NBLPool = NdisAllocateNetBufferListPool(MiniportAdapterHandle, &NblPoolParameters); Ctx->NBLPool = NdisAllocateNetBufferListPool(MiniportAdapterHandle, &NblPoolParameters);
if (!Ctx->NBLPool) if (Status = NDIS_STATUS_FAILURE, !Ctx->NBLPool)
{
Status = NDIS_STATUS_FAILURE;
goto cleanup_NdisDeregisterDeviceEx; goto cleanup_NdisDeregisterDeviceEx;
}
NDIS_MINIPORT_ADAPTER_REGISTRATION_ATTRIBUTES AdapterRegistrationAttributes = { NDIS_MINIPORT_ADAPTER_REGISTRATION_ATTRIBUTES AdapterRegistrationAttributes = {
.Header = { .Type = NDIS_OBJECT_TYPE_MINIPORT_ADAPTER_REGISTRATION_ATTRIBUTES, .Header = { .Type = NDIS_OBJECT_TYPE_MINIPORT_ADAPTER_REGISTRATION_ATTRIBUTES,
@ -1282,13 +1274,10 @@ TunInitializeEx(
.InterfaceType = NdisInterfaceInternal, .InterfaceType = NdisInterfaceInternal,
.MiniportAdapterContext = Ctx .MiniportAdapterContext = Ctx
}; };
if (!NT_SUCCESS( if (Status = NDIS_STATUS_FAILURE,
Status = NdisMSetMiniportAttributes( !NT_SUCCESS(NdisMSetMiniportAttributes(
MiniportAdapterHandle, (PNDIS_MINIPORT_ADAPTER_ATTRIBUTES)&AdapterRegistrationAttributes))) MiniportAdapterHandle, (PNDIS_MINIPORT_ADAPTER_ATTRIBUTES)&AdapterRegistrationAttributes)))
{
Status = NDIS_STATUS_FAILURE;
goto cleanup_NdisFreeNetBufferListPool; goto cleanup_NdisFreeNetBufferListPool;
}
NDIS_PM_CAPABILITIES PmCapabilities = { NDIS_PM_CAPABILITIES PmCapabilities = {
.Header = { .Type = NDIS_OBJECT_TYPE_DEFAULT, .Header = { .Type = NDIS_OBJECT_TYPE_DEFAULT,
@ -1349,13 +1338,10 @@ TunInitializeEx(
.SupportedOidListLength = sizeof(SupportedOids), .SupportedOidListLength = sizeof(SupportedOids),
.PowerManagementCapabilitiesEx = &PmCapabilities .PowerManagementCapabilitiesEx = &PmCapabilities
}; };
if (!NT_SUCCESS( if (Status = NDIS_STATUS_FAILURE,
Status = NdisMSetMiniportAttributes( !NT_SUCCESS(NdisMSetMiniportAttributes(
MiniportAdapterHandle, (PNDIS_MINIPORT_ADAPTER_ATTRIBUTES)&AdapterGeneralAttributes))) MiniportAdapterHandle, (PNDIS_MINIPORT_ADAPTER_ATTRIBUTES)&AdapterGeneralAttributes)))
{
Status = NDIS_STATUS_FAILURE;
goto cleanup_NdisFreeNetBufferListPool; goto cleanup_NdisFreeNetBufferListPool;
}
/* A miniport driver can call NdisMIndicateStatusEx after setting its /* A miniport driver can call NdisMIndicateStatusEx after setting its
* registration attributes even if the driver is still in the context * registration attributes even if the driver is still in the context
@ -1381,19 +1367,21 @@ TunDeviceSetDenyAllDacl(_In_ DEVICE_OBJECT *DeviceObject)
ACL Acl; ACL Acl;
HANDLE DeviceObjectHandle; HANDLE DeviceObjectHandle;
if (!NT_SUCCESS(Status = RtlCreateSecurityDescriptor(&Sd, SECURITY_DESCRIPTOR_REVISION))) if (!NT_SUCCESS(Status = RtlCreateSecurityDescriptor(&Sd, SECURITY_DESCRIPTOR_REVISION)) ||
return Status; !NT_SUCCESS(Status = RtlCreateAcl(&Acl, sizeof(ACL), ACL_REVISION)) ||
if (!NT_SUCCESS(Status = RtlCreateAcl(&Acl, sizeof(ACL), ACL_REVISION))) !NT_SUCCESS(Status = RtlSetDaclSecurityDescriptor(&Sd, TRUE, &Acl, FALSE)) ||
return Status; !NT_SUCCESS(
if (!NT_SUCCESS(Status = RtlSetDaclSecurityDescriptor(&Sd, TRUE, &Acl, FALSE))) Status = ObOpenObjectByPointer(
return Status; DeviceObject,
Status = ObOpenObjectByPointer( OBJ_KERNEL_HANDLE,
DeviceObject, OBJ_KERNEL_HANDLE, NULL, WRITE_DAC, *IoDeviceObjectType, KernelMode, &DeviceObjectHandle); NULL,
if (!NT_SUCCESS(Status)) WRITE_DAC,
*IoDeviceObjectType,
KernelMode,
&DeviceObjectHandle)))
return Status; return Status;
Status = ZwSetSecurityObject(DeviceObjectHandle, DACL_SECURITY_INFORMATION, &Sd); Status = ZwSetSecurityObject(DeviceObjectHandle, DACL_SECURITY_INFORMATION, &Sd);
ZwClose(DeviceObjectHandle); ZwClose(DeviceObjectHandle);
return Status; return Status;
} }