Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [KD] [KD64] Introduce KdpPrintBanner and use it in all places where we print the (now consistent) banner instead of copying the code over and over again.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7d388c3508956cc1cb36… commit a7d388c3508956cc1cb365ea955cda36a1bded81 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Mon Oct 16 11:47:14 2017 +0200 [KD] [KD64] Introduce KdpPrintBanner and use it in all places where we print the (now consistent) banner instead of copying the code over and over again. I still don't like that we're copying code between KD and KD64 instead of sharing it. But as both modules are totally distinct at the moment, I won't be the one introducing shared functions between them. This is a follow up to 50ae5e7c5268222718174221366169e2b115b06a, which TortoiseGit accidentally turned into a "Message only" commit... Never hit ALT+Y by mistake! ;) --- ntoskrnl/kd/kdio.c | 39 +++++++++++++++------------------------ ntoskrnl/kd64/kdinit.c | 28 +++++++++++++++++----------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 40795de8bc..8dc3366f03 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -96,6 +96,18 @@ KdpGetMemorySizeInMBs(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return NumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; } +/* See also: kd64\kdinit.c */ +static VOID +INIT_FUNCTION +KdpPrintBanner(IN SIZE_T MemSizeMBs) +{ + DPRINT1("-----------------------------------------------------\n"); + DPRINT1("ReactOS " KERNEL_VERSION_STR " (Build " KERNEL_VERSION_BUILD_STR ") (Commit " KERNEL_VERSION_COMMIT_HASH ")\n"); + DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); + DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); + DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, KeLoaderBlock->NtHalPathName, KeLoaderBlock->ArcHalDeviceName, KeLoaderBlock->NtBootPathName); +} + /* FILE DEBUG LOG FUNCTIONS **************************************************/ VOID @@ -243,15 +255,8 @@ KdpInitDebugLog(PKD_DISPATCH_TABLE DispatchTable, KeInitializeSpinLock(&KdpDebugLogSpinLock); /* Display separator + ReactOS version at start of the debug log */ - DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; - DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); - DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, - KeLoaderBlock->NtHalPathName, - KeLoaderBlock->ArcHalDeviceName, - KeLoaderBlock->NtBootPathName); + KdpPrintBanner(MemSizeMBs); } else if (BootPhase == 2) { @@ -381,15 +386,8 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); /* Display separator + ReactOS version at start of the debug log */ - DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS " KERNEL_VERSION_STR " (Build " KERNEL_VERSION_BUILD_STR ") (Commit " KERNEL_VERSION_COMMIT_HASH "\n"); MemSizeMBs = KdpGetMemorySizeInMBs(KeLoaderBlock); - DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); - DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, - KeLoaderBlock->NtHalPathName, - KeLoaderBlock->ArcHalDeviceName, - KeLoaderBlock->NtBootPathName); + KdpPrintBanner(MemSizeMBs); } else if (BootPhase == 2) { @@ -556,15 +554,8 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, KeInitializeSpinLock(&KdpDmesgLogSpinLock); /* Display separator + ReactOS version at start of the debug log */ - DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; - DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); - DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, - KeLoaderBlock->NtHalPathName, - KeLoaderBlock->ArcHalDeviceName, - KeLoaderBlock->NtBootPathName); + KdpPrintBanner(MemSizeMBs); } else if (BootPhase == 2) { diff --git a/ntoskrnl/kd64/kdinit.c b/ntoskrnl/kd64/kdinit.c index 590e3b7aa0..64a7c7b519 100644 --- a/ntoskrnl/kd64/kdinit.c +++ b/ntoskrnl/kd64/kdinit.c @@ -65,6 +65,22 @@ KdpGetMemorySizeInMBs(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return NumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; } +/* See also: kd\kdio.c */ +static VOID +INIT_FUNCTION +KdpPrintBanner(IN SIZE_T MemSizeMBs) +{ + DPRINT1("-----------------------------------------------------\n"); + DPRINT1("ReactOS " KERNEL_VERSION_STR " (Build " KERNEL_VERSION_BUILD_STR ") (Commit " KERNEL_VERSION_COMMIT_HASH ")\n"); + DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); + + if (KeLoaderBlock) + { + DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); + DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, KeLoaderBlock->NtHalPathName, KeLoaderBlock->ArcHalDeviceName, KeLoaderBlock->NtBootPathName); + } +} + /* FUNCTIONS *****************************************************************/ VOID @@ -375,18 +391,8 @@ KdInitSystem(IN ULONG BootPhase, SharedUserData->KdDebuggerEnabled = TRUE; /* Display separator + ReactOS version at start of the debug log */ - DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); MemSizeMBs = KdpGetMemorySizeInMBs(KeLoaderBlock); - DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); - if (KeLoaderBlock) - { - DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, - KeLoaderBlock->NtHalPathName, - KeLoaderBlock->ArcHalDeviceName, - KeLoaderBlock->NtBootPathName); - } + KdpPrintBanner(MemSizeMBs); /* Check if the debugger should be disabled initially */ if (DisableKdAfterInit)

7 years, 2 months

[reactos] 01/01: [KD] [KD64] Introduce KdpPrintBanner and use it in all places where we print the (now consistent) banner instead of copying the code over and over again.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50ae5e7c5268222718174… commit 50ae5e7c5268222718174221366169e2b115b06a Author: Colin Finck <colin(a)reactos.org> AuthorDate: Mon Oct 16 11:40:52 2017 +0200 [KD] [KD64] Introduce KdpPrintBanner and use it in all places where we print the (now consistent) banner instead of copying the code over and over again. I still don't like that we're copying code between KD and KD64 instead of sharing it. But as both modules are totally distinct at the moment, I won't be the one introducing shared functions between them.

7 years, 2 months

[reactos] 01/01: [KD] Output the long commit hash as well at the start of the debug log.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cf30244cfc47c7749256… commit 2cf30244cfc47c774925617bcc0785e09b0cf964 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Mon Oct 16 10:38:12 2017 +0200 [KD] Output the long commit hash as well at the start of the debug log. This will be used by Testman. Previously, it had to translate the short hash from the build number to a long hash, but such a database (GitInfo) only exists for commits in the master branch. --- ntoskrnl/kd/kdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 7b43657313..40795de8bc 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -382,7 +382,7 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, /* Display separator + ReactOS version at start of the debug log */ DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + DPRINT1("ReactOS " KERNEL_VERSION_STR " (Build " KERNEL_VERSION_BUILD_STR ") (Commit " KERNEL_VERSION_COMMIT_HASH "\n"); MemSizeMBs = KdpGetMemorySizeInMBs(KeLoaderBlock); DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions);

7 years, 2 months

[reactos] 01/01: [STORPORT] Query the bus interface of the lower (bus) device and implement StorPortGetBusData(). CORE-13866

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b21019e3d1bfa6614c89f… commit b21019e3d1bfa6614c89fd38ec6bcfce94c0e46a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 16 00:13:21 2017 +0200 [STORPORT] Query the bus interface of the lower (bus) device and implement StorPortGetBusData(). CORE-13866 --- drivers/storage/port/storport/fdo.c | 14 +++++++++ drivers/storage/port/storport/misc.c | 50 ++++++++++++++++++++++++++++++++ drivers/storage/port/storport/precomp.h | 11 +++++++ drivers/storage/port/storport/storport.c | 31 +++++++++++++++++--- 4 files changed, 102 insertions(+), 4 deletions(-) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index 3f569ac5c9..70b6a30dd3 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -114,6 +114,20 @@ PortFdoStartDevice( return STATUS_NO_MEMORY; } + /* Get the bus interface of the lower (bus) device */ + Status = QueryBusInterface(DeviceExtension->LowerDevice, + (PGUID)&GUID_BUS_INTERFACE_STANDARD, + sizeof(BUS_INTERFACE_STANDARD), + 1, + &DeviceExtension->BusInterface, + NULL); + DPRINT1("Status: 0x%08lx\n", Status); + if (NT_SUCCESS(Status)) + { + DPRINT1("Context: %p\n", DeviceExtension->BusInterface.Context); + DeviceExtension->BusInitialized = TRUE; + } + /* Start the miniport (FindAdapter & Initialize) */ Status = PortFdoStartMiniport(DeviceExtension); if (!NT_SUCCESS(Status)) diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index 5f42be2fe8..bcbdb05912 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -167,4 +167,54 @@ CopyResourceList( } +NTSTATUS +QueryBusInterface( + PDEVICE_OBJECT DeviceObject, + PGUID Guid, + USHORT Size, + USHORT Version, + PBUS_INTERFACE_STANDARD Interface, + PVOID InterfaceSpecificData) +{ + KEVENT Event; + NTSTATUS Status; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION Stack; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatus); + if (Irp == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Stack = IoGetNextIrpStackLocation(Irp); + + Stack->MajorFunction = IRP_MJ_PNP; + Stack->MinorFunction = IRP_MN_QUERY_INTERFACE; + Stack->Parameters.QueryInterface.InterfaceType = Guid; + Stack->Parameters.QueryInterface.Size = Size; + Stack->Parameters.QueryInterface.Version = Version; + Stack->Parameters.QueryInterface.Interface = (PINTERFACE)Interface; + Stack->Parameters.QueryInterface.InterfaceSpecificData = InterfaceSpecificData; + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + Status=IoStatus.Status; + } + + return Status; +} + /* EOF */ diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index beacc8eb77..1bbd70c00e 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -93,6 +93,8 @@ typedef struct _FDO_DEVICE_EXTENSION ULONG SlotNumber; PCM_RESOURCE_LIST AllocatedResources; PCM_RESOURCE_LIST TranslatedResources; + BUS_INTERFACE_STANDARD BusInterface; + BOOLEAN BusInitialized; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; @@ -155,6 +157,15 @@ CopyResourceList( POOL_TYPE PoolType, PCM_RESOURCE_LIST Source); +NTSTATUS +QueryBusInterface( + PDEVICE_OBJECT DeviceObject, + PGUID Guid, + USHORT Size, + USHORT Version, + PBUS_INTERFACE_STANDARD Interface, + PVOID InterfaceSpecificData); + /* pdo.c */ diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c index 3520bbf3a3..170c4eb678 100644 --- a/drivers/storage/port/storport/storport.c +++ b/drivers/storage/port/storport/storport.c @@ -548,7 +548,7 @@ StorPortFreeRegistryBuffer( /* - * @unimplemented + * @implemented */ STORPORT_API ULONG @@ -561,9 +561,32 @@ StorPortGetBusData( _Out_ _When_(Length != 0, _Out_writes_bytes_(Length)) PVOID Buffer, _In_ ULONG Length) { - DPRINT1("StorPortGetBusData()\n"); - UNIMPLEMENTED; - return 0; + PMINIPORT_DEVICE_EXTENSION MiniportExtension; + PBUS_INTERFACE_STANDARD Interface; + ULONG ReturnLength; + + DPRINT1("StorPortGetBusData(%p %lu %lu %lu %p %lu)\n", + DeviceExtension, BusDataType, SystemIoBusNumber, SlotNumber, Buffer, Length); + + MiniportExtension = CONTAINING_RECORD(DeviceExtension, + MINIPORT_DEVICE_EXTENSION, + HwDeviceExtension); + DPRINT1("DeviceExtension %p MiniportExtension %p\n", + DeviceExtension, MiniportExtension); + + Interface = &MiniportExtension->Miniport->DeviceExtension->BusInterface; + + if (BusDataType == 4) + BusDataType = 0; + + ReturnLength = Interface->GetBusData(Interface->Context, + BusDataType, + Buffer, + 0, + Length); + DPRINT1("ReturnLength: %lu\n", ReturnLength); + + return ReturnLength; }

7 years, 2 months

[reactos] 01/01: [STORPORT] Attach copies of the resource lists to the FDO device extension and use them to fill the access ranges in the port configuration. Storahci does not crash on initialization any more. :-) CORE-13866

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f5aeb93638a4ec2592eb… commit 3f5aeb93638a4ec2592ebd6b4d4be319bc8b510b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 15 15:21:56 2017 +0200 [STORPORT] Attach copies of the resource lists to the FDO device extension and use them to fill the access ranges in the port configuration. Storahci does not crash on initialization any more. :-) CORE-13866 --- drivers/storage/port/storport/fdo.c | 19 ++++ drivers/storage/port/storport/miniport.c | 151 ++++++++++++++++++++++++++++++- drivers/storage/port/storport/misc.c | 72 +++++++++++++++ drivers/storage/port/storport/precomp.h | 9 ++ 4 files changed, 250 insertions(+), 1 deletion(-) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index cb85d65c77..3f569ac5c9 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -74,6 +74,7 @@ PortFdoStartDevice( _In_ PFDO_DEVICE_EXTENSION DeviceExtension, _In_ PIRP Irp) { + PIO_STACK_LOCATION Stack; NTSTATUS Status; DPRINT1("PortFdoStartDevice(%p %p)\n", @@ -81,6 +82,9 @@ PortFdoStartDevice( ASSERT(DeviceExtension->ExtensionType == FdoExtension); + /* Get the current stack location */ + Stack = IoGetCurrentIrpStackLocation(Irp); + /* Start the lower device if the FDO is in 'stopped' state */ if (DeviceExtension->PnpState == dsStopped) { @@ -95,6 +99,21 @@ PortFdoStartDevice( /* Change to the 'started' state */ DeviceExtension->PnpState = dsStarted; + /* Copy the raw and translated resource lists into the device extension */ + if (Stack->Parameters.StartDevice.AllocatedResources != NULL && + Stack->Parameters.StartDevice.AllocatedResourcesTranslated != NULL) + { + DeviceExtension->AllocatedResources = CopyResourceList(NonPagedPool, + Stack->Parameters.StartDevice.AllocatedResources); + if (DeviceExtension->AllocatedResources == NULL) + return STATUS_NO_MEMORY; + + DeviceExtension->TranslatedResources = CopyResourceList(NonPagedPool, + Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + if (DeviceExtension->TranslatedResources == NULL) + return STATUS_NO_MEMORY; + } + /* Start the miniport (FindAdapter & Initialize) */ Status = PortFdoStartMiniport(DeviceExtension); if (!NT_SUCCESS(Status)) diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index dc4818dbd2..852ef426a4 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -89,6 +89,147 @@ InitializeConfiguration( } +static +VOID +AssignResourcesToConfiguration( + _In_ PPORT_CONFIGURATION_INFORMATION PortConfiguration, + _In_ PCM_RESOURCE_LIST ResourceList, + _In_ ULONG NumberOfAccessRanges) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + PACCESS_RANGE AccessRange; + INT i, j; + ULONG RangeNumber = 0, Interrupt = 0, Dma = 0; + + DPRINT1("AssignResourceToConfiguration(%p %p %lu)\n", + PortConfiguration, ResourceList, NumberOfAccessRanges); + + FullDescriptor = &ResourceList->List[0]; + for (i = 0; i < ResourceList->Count; i++) + { + PartialResourceList = &FullDescriptor->PartialResourceList; + + for (j = 0; j < PartialResourceList->Count; j++) + { + PartialDescriptor = &PartialResourceList->PartialDescriptors[j]; + + switch (PartialDescriptor->Type) + { + case CmResourceTypePort: + DPRINT1("Port: 0x%I64x (0x%lx)\n", + PartialDescriptor->u.Port.Start.QuadPart, + PartialDescriptor->u.Port.Length); + if (RangeNumber < NumberOfAccessRanges) + { + AccessRange = &((*(PortConfiguration->AccessRanges))[RangeNumber]); + AccessRange->RangeStart = PartialDescriptor->u.Port.Start; + AccessRange->RangeLength = PartialDescriptor->u.Port.Length; + AccessRange->RangeInMemory = FALSE; + RangeNumber++; + } + break; + + case CmResourceTypeMemory: + DPRINT1("Memory: 0x%I64x (0x%lx)\n", + PartialDescriptor->u.Memory.Start.QuadPart, + PartialDescriptor->u.Memory.Length); + if (RangeNumber < NumberOfAccessRanges) + { + AccessRange = &((*(PortConfiguration->AccessRanges))[RangeNumber]); + AccessRange->RangeStart = PartialDescriptor->u.Memory.Start; + AccessRange->RangeLength = PartialDescriptor->u.Memory.Length; + AccessRange->RangeInMemory = TRUE; + RangeNumber++; + } + break; + + case CmResourceTypeInterrupt: + DPRINT1("Interrupt: Level %lu Vector %lu\n", + PartialDescriptor->u.Interrupt.Level, + PartialDescriptor->u.Interrupt.Vector); + if (Interrupt == 0) + { + /* Copy interrupt data */ + PortConfiguration->BusInterruptLevel = PartialDescriptor->u.Interrupt.Level; + PortConfiguration->BusInterruptVector = PartialDescriptor->u.Interrupt.Vector; + + /* Set interrupt mode accordingly to the resource */ + if (PartialDescriptor->Flags == CM_RESOURCE_INTERRUPT_LATCHED) + { + PortConfiguration->InterruptMode = Latched; + } + else if (PartialDescriptor->Flags == CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE) + { + PortConfiguration->InterruptMode = LevelSensitive; + } + } + else if (Interrupt == 1) + { + /* Copy interrupt data */ + PortConfiguration->BusInterruptLevel2 = PartialDescriptor->u.Interrupt.Level; + PortConfiguration->BusInterruptVector2 = PartialDescriptor->u.Interrupt.Vector; + + /* Set interrupt mode accordingly to the resource */ + if (PartialDescriptor->Flags == CM_RESOURCE_INTERRUPT_LATCHED) + { + PortConfiguration->InterruptMode2 = Latched; + } + else if (PartialDescriptor->Flags == CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE) + { + PortConfiguration->InterruptMode2 = LevelSensitive; + } + } + Interrupt++; + break; + + case CmResourceTypeDma: + DPRINT1("Dma: Channel: %lu Port: %lu\n", + PartialDescriptor->u.Dma.Channel, + PartialDescriptor->u.Dma.Port); + if (Dma == 0) + { + PortConfiguration->DmaChannel = PartialDescriptor->u.Dma.Channel; + PortConfiguration->DmaPort = PartialDescriptor->u.Dma.Port; + + if (PartialDescriptor->Flags & CM_RESOURCE_DMA_8) + PortConfiguration->DmaWidth = Width8Bits; + else if ((PartialDescriptor->Flags & CM_RESOURCE_DMA_16) || + (PartialDescriptor->Flags & CM_RESOURCE_DMA_8_AND_16)) + PortConfiguration->DmaWidth = Width16Bits; + else if (PartialDescriptor->Flags & CM_RESOURCE_DMA_32) + PortConfiguration->DmaWidth = Width32Bits; + } + else if (Dma == 1) + { + PortConfiguration->DmaChannel2 = PartialDescriptor->u.Dma.Channel; + PortConfiguration->DmaPort2 = PartialDescriptor->u.Dma.Port; + + if (PartialDescriptor->Flags & CM_RESOURCE_DMA_8) + PortConfiguration->DmaWidth2 = Width8Bits; + else if ((PartialDescriptor->Flags & CM_RESOURCE_DMA_16) || + (PartialDescriptor->Flags & CM_RESOURCE_DMA_8_AND_16)) + PortConfiguration->DmaWidth2 = Width16Bits; + else if (PartialDescriptor->Flags & CM_RESOURCE_DMA_32) + PortConfiguration->DmaWidth2 = Width32Bits; + } + Dma++; + break; + + default: + DPRINT1("Other: %u\n", PartialDescriptor->Type); + break; + } + } + + /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ + FullDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(FullDescriptor->PartialResourceList.PartialDescriptors + + FullDescriptor->PartialResourceList.Count); + } +} + + NTSTATUS MiniportInitialize( _In_ PMINIPORT Miniport, @@ -126,8 +267,15 @@ MiniportInitialize( InitData, DeviceExtension->BusNumber, DeviceExtension->SlotNumber); + if (!NT_SUCCESS(Status)) + return Status; - return Status; + /* Assign the resources to the port configuration */ + AssignResourcesToConfiguration(&Miniport->PortConfig, + DeviceExtension->AllocatedResources, + InitData->NumberOfAccessRanges); + + return STATUS_SUCCESS; } @@ -150,6 +298,7 @@ MiniportFindAdapter( &Reserved); DPRINT1("HwFindAdapter() returned %lu\n", Result); + /* Convert the result to a status code */ switch (Result) { case SP_RETURN_NOT_FOUND: diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index 54832c48aa..5f42be2fe8 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -95,4 +95,76 @@ GetBusInterface( return InterfaceTypeUndefined; } + +static +ULONG +GetResourceListSize( + PCM_RESOURCE_LIST ResourceList) +{ + PCM_FULL_RESOURCE_DESCRIPTOR Descriptor; + INT i; + ULONG Size; + + DPRINT1("GetResourceListSize(%p)\n", ResourceList); + + Size = sizeof(CM_RESOURCE_LIST); + if (ResourceList->Count == 0) + { + DPRINT1("Size: 0x%lx (%u)\n", Size, Size); + return Size; + } + + DPRINT1("ResourceList->Count: %lu\n", ResourceList->Count); + + Descriptor = &ResourceList->List[0]; + for (i = 0; i < ResourceList->Count; i++) + { + /* Process resources in CM_FULL_RESOURCE_DESCRIPTOR block number ix. */ + + DPRINT1("PartialResourceList->Count: %lu\n", Descriptor->PartialResourceList.Count); + + /* Add the size of the current full descriptor */ + Size += sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + (Descriptor->PartialResourceList.Count - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + + /* Advance to next CM_FULL_RESOURCE_DESCRIPTOR block in memory. */ + Descriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)(Descriptor->PartialResourceList.PartialDescriptors + + Descriptor->PartialResourceList.Count); + } + + DPRINT1("Size: 0x%lx (%u)\n", Size, Size); + return Size; +} + + +PCM_RESOURCE_LIST +CopyResourceList( + POOL_TYPE PoolType, + PCM_RESOURCE_LIST Source) +{ + PCM_RESOURCE_LIST Destination; + ULONG Size; + + DPRINT1("CopyResourceList(%lu %p)\n", + PoolType, Source); + + /* Get the size of the resource list */ + Size = GetResourceListSize(Source); + + /* Allocate a new buffer */ + Destination = ExAllocatePoolWithTag(PoolType, + Size, + TAG_RESOURCE_LIST); + if (Destination == NULL) + return NULL; + + /* Copy the resource list */ + RtlCopyMemory(Destination, + Source, + Size); + + return Destination; +} + + /* EOF */ diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index b084e0e9da..beacc8eb77 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -27,6 +27,7 @@ #define TAG_INIT_DATA 'DItS' #define TAG_MINIPORT_DATA 'DMtS' #define TAG_ACCRESS_RANGE 'RAtS' +#define TAG_RESOURCE_LIST 'LRtS' typedef enum { @@ -90,6 +91,8 @@ typedef struct _FDO_DEVICE_EXTENSION MINIPORT Miniport; ULONG BusNumber; ULONG SlotNumber; + PCM_RESOURCE_LIST AllocatedResources; + PCM_RESOURCE_LIST TranslatedResources; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; @@ -147,6 +150,12 @@ INTERFACE_TYPE GetBusInterface( PDEVICE_OBJECT DeviceObject); +PCM_RESOURCE_LIST +CopyResourceList( + POOL_TYPE PoolType, + PCM_RESOURCE_LIST Source); + + /* pdo.c */ NTSTATUS

7 years, 2 months

[reactos] 01/01: [LIBTIRPC] Fix CVE-2017-8779 by backporting its fix CORE-13460

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6808e7d25b8262f70011e… commit 6808e7d25b8262f70011e53f3dc46db7aa0813fa Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 15 13:54:11 2017 +0200 [LIBTIRPC] Fix CVE-2017-8779 by backporting its fix CORE-13460 --- dll/3rdparty/libtirpc/src/rpc_generic.c | 14 +++++++++ dll/3rdparty/libtirpc/src/rpcb_prot.c | 44 +++++++++++++++++++++++++++++ dll/3rdparty/libtirpc/src/rpcb_st_xdr.c | 19 +++++++++++++ dll/3rdparty/libtirpc/src/xdr.c | 50 +++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+) diff --git a/dll/3rdparty/libtirpc/src/rpc_generic.c b/dll/3rdparty/libtirpc/src/rpc_generic.c index f3bbc73c46..fc646f5bc5 100644 --- a/dll/3rdparty/libtirpc/src/rpc_generic.c +++ b/dll/3rdparty/libtirpc/src/rpc_generic.c @@ -679,6 +679,11 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) switch (af) { case AF_INET: +#ifdef __REACTOS__ // CVE-2017-8779 + if (nbuf->len < sizeof(*sin)) { + return NULL; + } +#endif sin = nbuf->buf; if (inet_ntop(af, &sin->sin_addr, namebuf, sizeof namebuf) == NULL) @@ -690,6 +695,11 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) break; #ifdef INET6 case AF_INET6: +#ifdef __REACTOS__ // CVE-2017-8779 + if (nbuf->len < sizeof(*sin6)) { + return NULL; + } +#endif sin6 = nbuf->buf; if (inet_ntop(af, &sin6->sin6_addr, namebuf6, sizeof namebuf6) == NULL) @@ -736,6 +746,10 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr) port = 0; sin = NULL; +#ifdef __REACTOS__ // CVE-2017-8779 + if (uaddr == NULL) + return NULL; +#endif addrstr = strdup(uaddr); if (addrstr == NULL) return NULL; diff --git a/dll/3rdparty/libtirpc/src/rpcb_prot.c b/dll/3rdparty/libtirpc/src/rpcb_prot.c index 0b762d1deb..da4c2d9ada 100644 --- a/dll/3rdparty/libtirpc/src/rpcb_prot.c +++ b/dll/3rdparty/libtirpc/src/rpcb_prot.c @@ -42,6 +42,9 @@ #include <rpc/types.h> #include <rpc/xdr.h> #include <rpc/rpcb_prot.h> +#ifdef __REACTOS__ // CVE-2017-8779 +#include "rpc_com.h" +#endif bool_t xdr_rpcb(xdrs, objp) @@ -54,6 +57,7 @@ xdr_rpcb(xdrs, objp) if (!xdr_u_int32_t(xdrs, &objp->r_vers)) { return (FALSE); } +#ifndef __REACTOS__ // CVE-2017-8779 if (!xdr_string(xdrs, &objp->r_netid, (u_int)~0)) { return (FALSE); } @@ -63,6 +67,17 @@ xdr_rpcb(xdrs, objp) if (!xdr_string(xdrs, &objp->r_owner, (u_int)~0)) { return (FALSE); } +#else + if (!xdr_string(xdrs, &objp->r_netid, RPC_MAXDATASIZE)) { + return (FALSE); + } + if (!xdr_string(xdrs, &objp->r_addr, RPC_MAXDATASIZE)) { + return (FALSE); + } + if (!xdr_string(xdrs, &objp->r_owner, RPC_MAXDATASIZE)) { + return (FALSE); + } +#endif return (TRUE); } @@ -160,21 +175,39 @@ xdr_rpcb_entry(xdrs, objp) XDR *xdrs; rpcb_entry *objp; { +#ifndef __REACTOS__ // CVE-2017-8779 if (!xdr_string(xdrs, &objp->r_maddr, (u_int)~0)) { return (FALSE); } if (!xdr_string(xdrs, &objp->r_nc_netid, (u_int)~0)) { return (FALSE); } +#else + if (!xdr_string(xdrs, &objp->r_maddr, RPC_MAXDATASIZE)) { + return (FALSE); + } + if (!xdr_string(xdrs, &objp->r_nc_netid, RPC_MAXDATASIZE)) { + return (FALSE); + } +#endif if (!xdr_u_int32_t(xdrs, &objp->r_nc_semantics)) { return (FALSE); } +#ifndef __REACTOS__ // CVE-2017-8779 if (!xdr_string(xdrs, &objp->r_nc_protofmly, (u_int)~0)) { return (FALSE); } if (!xdr_string(xdrs, &objp->r_nc_proto, (u_int)~0)) { return (FALSE); } +#else + if (!xdr_string(xdrs, &objp->r_nc_protofmly, RPC_MAXDATASIZE)) { + return (FALSE); + } + if (!xdr_string(xdrs, &objp->r_nc_proto, RPC_MAXDATASIZE)) { + return (FALSE); + } +#endif return (TRUE); } @@ -293,7 +326,11 @@ xdr_rpcb_rmtcallres(xdrs, p) bool_t dummy; struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p; +#ifdef __REACTOS__ // CVE-2017-8779 + if (!xdr_string(xdrs, &objp->addr, RPC_MAXDATASIZE)) { +#else if (!xdr_string(xdrs, &objp->addr, (u_int)~0)) { +#endif return (FALSE); } if (!xdr_u_int(xdrs, &objp->results.results_len)) { @@ -313,6 +350,13 @@ xdr_netbuf(xdrs, objp) if (!xdr_u_int32_t(xdrs, (u_int32_t *) &objp->maxlen)) { return (FALSE); } +#ifdef __REACTOS__ // CVE-2017-8779 + + if (objp->maxlen > RPC_MAXDATASIZE) { + return (FALSE); + } + +#endif dummy = xdr_bytes(xdrs, (char **)&(objp->buf), (u_int *)&(objp->len), objp->maxlen); return (dummy); diff --git a/dll/3rdparty/libtirpc/src/rpcb_st_xdr.c b/dll/3rdparty/libtirpc/src/rpcb_st_xdr.c index 6feb70b486..76c0bd1e33 100644 --- a/dll/3rdparty/libtirpc/src/rpcb_st_xdr.c +++ b/dll/3rdparty/libtirpc/src/rpcb_st_xdr.c @@ -39,6 +39,9 @@ #include <wintirpc.h> #include <rpc/rpc.h> +#ifdef __REACTOS__ // CVE-2017-8779 +#include "rpc_com.h" +#endif /* Link list of all the stats about getport and getaddr */ @@ -60,7 +63,11 @@ xdr_rpcbs_addrlist(xdrs, objp) if (!xdr_int(xdrs, &objp->failure)) { return (FALSE); } +#ifdef __REACTOS__ // CVE-2017-8779 + if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { +#else if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { +#endif return (FALSE); } @@ -111,7 +118,11 @@ xdr_rpcbs_rmtcalllist(xdrs, objp) IXDR_PUT_INT32(buf, objp->failure); IXDR_PUT_INT32(buf, objp->indirect); } +#ifdef __REACTOS__ // CVE-2017-8779 + if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { +#else if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { +#endif return (FALSE); } if (!xdr_pointer(xdrs, (char **)&objp->next, @@ -149,7 +160,11 @@ xdr_rpcbs_rmtcalllist(xdrs, objp) objp->failure = (int)IXDR_GET_INT32(buf); objp->indirect = (int)IXDR_GET_INT32(buf); } +#ifdef __REACTOS__ // CVE-2017-8779 + if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { +#else if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { +#endif return (FALSE); } if (!xdr_pointer(xdrs, (char **)&objp->next, @@ -177,7 +192,11 @@ xdr_rpcbs_rmtcalllist(xdrs, objp) if (!xdr_int(xdrs, &objp->indirect)) { return (FALSE); } +#ifdef __REACTOS__ // CVE-2017-8779 + if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { +#else if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { +#endif return (FALSE); } if (!xdr_pointer(xdrs, (char **)&objp->next, diff --git a/dll/3rdparty/libtirpc/src/xdr.c b/dll/3rdparty/libtirpc/src/xdr.c index 85396b3420..7804a2bdb9 100644 --- a/dll/3rdparty/libtirpc/src/xdr.c +++ b/dll/3rdparty/libtirpc/src/xdr.c @@ -44,8 +44,14 @@ #include <stdlib.h> #include <string.h> +#ifdef __REACTOS__ // CVE-2017-8779 +#include <rpc/rpc.h> +#endif #include <rpc/types.h> #include <rpc/xdr.h> +#ifdef __REACTOS__ // CVE-2017-8779 +#include <rpc/rpc_com.h> +#endif typedef quad_t longlong_t; /* ANSI long long type */ typedef u_quad_t u_longlong_t; /* ANSI unsigned long long type */ @@ -55,7 +61,9 @@ typedef u_quad_t u_longlong_t; /* ANSI unsigned long long type */ */ #define XDR_FALSE ((long) 0) #define XDR_TRUE ((long) 1) +#ifndef __REACTOS__ // CVE-2017-8779 #define LASTUNSIGNED ((u_int) 0-1) +#endif /* * for unit alignment @@ -533,6 +541,9 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) { char *sp = *cpp; /* sp is the actual string pointer */ u_int nodesize; +#ifdef __REACTOS__ // CVE-2017-8779 + bool_t ret, allocated = FALSE; +#endif /* * first deal with the length since xdr bytes are counted @@ -556,6 +567,9 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) } if (sp == NULL) { *cpp = sp = mem_alloc(nodesize); +#ifdef __REACTOS__ // CVE-2017-8779 + allocated = TRUE; +#endif } if (sp == NULL) { //warnx("xdr_bytes: out of memory"); @@ -564,7 +578,18 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) /* FALLTHROUGH */ case XDR_ENCODE: +#ifndef __REACTOS__ // CVE-2017-8779 return (xdr_opaque(xdrs, sp, nodesize)); +#else + ret = xdr_opaque(xdrs, sp, nodesize); + if ((xdrs->x_op == XDR_DECODE) && (ret == FALSE)) { + if (allocated == TRUE) { + free(sp); + *cpp = NULL; + } + } + return (ret); +#endif case XDR_FREE: if (sp != NULL) { @@ -658,6 +683,9 @@ xdr_string(xdrs, cpp, maxsize) char *sp = *cpp; /* sp is the actual string pointer */ u_int size; u_int nodesize; +#ifdef __REACTOS__ // CVE-2017-8779 + bool_t ret, allocated = FALSE; +#endif /* * first deal with the length since xdr strings are counted-strings @@ -697,8 +725,15 @@ xdr_string(xdrs, cpp, maxsize) switch (xdrs->x_op) { case XDR_DECODE: +#ifndef __REACTOS__ // CVE-2017-8779 if (sp == NULL) *cpp = sp = mem_alloc(nodesize); +#else + if (sp == NULL) { + *cpp = sp = mem_alloc(nodesize); + allocated = TRUE; + } +#endif if (sp == NULL) { //warnx("xdr_string: out of memory"); return (FALSE); @@ -707,7 +742,18 @@ xdr_string(xdrs, cpp, maxsize) /* FALLTHROUGH */ case XDR_ENCODE: +#ifndef __REACTOS__ // CVE-2017-8779 return (xdr_opaque(xdrs, sp, size)); +#else + ret = xdr_opaque(xdrs, sp, size); + if ((xdrs->x_op == XDR_DECODE) && (ret == FALSE)) { + if (allocated == TRUE) { + free(sp); + *cpp = NULL; + } + } + return (ret); +#endif case XDR_FREE: mem_free(sp, nodesize); @@ -727,7 +773,11 @@ xdr_wrapstring(xdrs, cpp) XDR *xdrs; char **cpp; { +#ifdef __REACTOS__ // CVE-2017-8779 + return xdr_string(xdrs, cpp, RPC_MAXDATASIZE); +#else return xdr_string(xdrs, cpp, LASTUNSIGNED); +#endif } /*

7 years, 2 months

[reactos] 01/01: [STORPORT] Initialize the port configuration and pass it to the HwFindAdapter routine.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd0027ba1959a6a2b9d88… commit dd0027ba1959a6a2b9d88ccec2ee991d5e05b7b0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 15 13:10:08 2017 +0200 [STORPORT] Initialize the port configuration and pass it to the HwFindAdapter routine. --- drivers/storage/port/storport/fdo.c | 23 +++++++++ drivers/storage/port/storport/miniport.c | 85 +++++++++++++++++++++++++++++++- drivers/storage/port/storport/precomp.h | 8 +-- 3 files changed, 110 insertions(+), 6 deletions(-) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index 6338c48d12..cb85d65c77 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -124,6 +124,28 @@ PortFdoQueryBusRelations( } +static +NTSTATUS +PortFdoFilterRequirements( + PFDO_DEVICE_EXTENSION DeviceExtension, + PIRP Irp) +{ + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + + DPRINT1("PortFdoFilterRequirements(%p %p)\n", DeviceExtension, Irp); + + /* Get the bus number and the slot number */ + RequirementsList =(PIO_RESOURCE_REQUIREMENTS_LIST)Irp->IoStatus.Information; + if (RequirementsList != NULL) + { + DeviceExtension->BusNumber = RequirementsList->BusNumber; + DeviceExtension->SlotNumber = RequirementsList->SlotNumber; + } + + return STATUS_SUCCESS; +} + + NTSTATUS NTAPI PortFdoPnp( @@ -197,6 +219,7 @@ PortFdoPnp( case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* 0x0d */ DPRINT1("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + PortFdoFilterRequirements(DeviceExtension, Irp); return ForwardIrpAndForget(DeviceExtension->LowerDevice, Irp); case IRP_MN_QUERY_PNP_DEVICE_STATE: /* 0x14 */ diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index 4e0b37e182..dc4818dbd2 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -15,6 +15,80 @@ /* FUNCTIONS ******************************************************************/ +static +NTSTATUS +InitializeConfiguration( + _In_ PPORT_CONFIGURATION_INFORMATION PortConfig, + _In_ PHW_INITIALIZATION_DATA InitData, + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber) +{ + PCONFIGURATION_INFORMATION ConfigInfo; + ULONG i; + + DPRINT1("InitializeConfiguration(%p %p %lu %lu)\n", + PortConfig, InitData, BusNumber, SlotNumber); + + /* Get the configurration information */ + ConfigInfo = IoGetConfigurationInformation(); + + /* Initialize the port configuration */ + RtlZeroMemory(PortConfig, + sizeof(PORT_CONFIGURATION_INFORMATION)); + + PortConfig->Length = sizeof(PORT_CONFIGURATION_INFORMATION); + PortConfig->SystemIoBusNumber = BusNumber; + PortConfig->SlotNumber = SlotNumber; + PortConfig->AdapterInterfaceType = InitData->AdapterInterfaceType; + + PortConfig->MaximumTransferLength = -1; //SP_UNINITIALIZED_VALUE; + PortConfig->DmaChannel = -1; //SP_UNINITIALIZED_VALUE; + PortConfig->DmaPort = -1; //SP_UNINITIALIZED_VALUE; + + PortConfig->InterruptMode = LevelSensitive; + + PortConfig->Master = TRUE; + PortConfig->AtdiskPrimaryClaimed = ConfigInfo->AtDiskPrimaryAddressClaimed; + PortConfig->AtdiskSecondaryClaimed = ConfigInfo->AtDiskSecondaryAddressClaimed; + PortConfig->Dma32BitAddresses = TRUE; + PortConfig->DemandMode = FALSE; + PortConfig->MapBuffers = InitData->MapBuffers; + + PortConfig->NeedPhysicalAddresses = TRUE; + PortConfig->TaggedQueuing = TRUE; + PortConfig->AutoRequestSense = TRUE; + PortConfig->MultipleRequestPerLu = TRUE; + PortConfig->ReceiveEvent = InitData->ReceiveEvent; + PortConfig->RealModeInitialized = FALSE; + PortConfig->BufferAccessScsiPortControlled = TRUE; + PortConfig->MaximumNumberOfTargets = 128; + + PortConfig->SpecificLuExtensionSize = InitData->SpecificLuExtensionSize; + PortConfig->SrbExtensionSize = InitData->SrbExtensionSize; + PortConfig->MaximumNumberOfLogicalUnits = 1; + PortConfig->WmiDataProvider = TRUE; + + PortConfig->NumberOfAccessRanges = InitData->NumberOfAccessRanges; + DPRINT1("NumberOfAccessRanges: %lu\n", PortConfig->NumberOfAccessRanges); + if (PortConfig->NumberOfAccessRanges != 0) + { + PortConfig->AccessRanges = ExAllocatePoolWithTag(NonPagedPool, + PortConfig->NumberOfAccessRanges * sizeof(ACCESS_RANGE), + TAG_ACCRESS_RANGE); + if (PortConfig->AccessRanges == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(PortConfig->AccessRanges, + PortConfig->NumberOfAccessRanges * sizeof(ACCESS_RANGE)); + } + + for (i = 0; i < 7; i++) + PortConfig->InitiatorBusId[i] = 0xff; + + return STATUS_SUCCESS; +} + + NTSTATUS MiniportInitialize( _In_ PMINIPORT Miniport, @@ -23,6 +97,7 @@ MiniportInitialize( { PMINIPORT_DEVICE_EXTENSION MiniportExtension; ULONG Size; + NTSTATUS Status; DPRINT1("MiniportInitialize(%p %p %p)\n", Miniport, DeviceExtension, InitData); @@ -46,7 +121,13 @@ MiniportInitialize( MiniportExtension->Miniport = Miniport; Miniport->MiniportExtension = MiniportExtension; - return STATUS_SUCCESS; + /* Initialize the port configuration */ + Status = InitializeConfiguration(&Miniport->PortConfig, + InitData, + DeviceExtension->BusNumber, + DeviceExtension->SlotNumber); + + return Status; } @@ -65,7 +146,7 @@ MiniportFindAdapter( NULL, NULL, NULL, - NULL, + &Miniport->PortConfig, &Reserved); DPRINT1("HwFindAdapter() returned %lu\n", Result); diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index 350ca6854d..b084e0e9da 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -26,6 +26,7 @@ #define TAG_GLOBAL_DATA 'DGtS' #define TAG_INIT_DATA 'DItS' #define TAG_MINIPORT_DATA 'DMtS' +#define TAG_ACCRESS_RANGE 'RAtS' typedef enum { @@ -72,6 +73,7 @@ typedef struct _MINIPORT { struct _FDO_DEVICE_EXTENSION *DeviceExtension; PHW_INITIALIZATION_DATA InitData; + PORT_CONFIGURATION_INFORMATION PortConfig; PMINIPORT_DEVICE_EXTENSION MiniportExtension; } MINIPORT, *PMINIPORT; @@ -82,14 +84,12 @@ typedef struct _FDO_DEVICE_EXTENSION PDEVICE_OBJECT Device; PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT PhysicalDevice; - PDRIVER_OBJECT_EXTENSION DriverExtension; - DEVICE_STATE PnpState; LIST_ENTRY AdapterListEntry; - MINIPORT Miniport; - + ULONG BusNumber; + ULONG SlotNumber; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION;

7 years, 2 months

[reactos] 02/02: [KERNEL32_APITEST] Add a few tests for GetVolumeInformation that were used to fix previous issues

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb05356a2615e0f079438… commit eb05356a2615e0f0794389358f52676e8aaa3aae Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 15 10:44:50 2017 +0200 [KERNEL32_APITEST] Add a few tests for GetVolumeInformation that were used to fix previous issues --- modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + .../apitests/kernel32/GetVolumeInformation.c | 127 +++++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 2 + 3 files changed, 130 insertions(+) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 32debf9476..86107d733d 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -13,6 +13,7 @@ list(APPEND SOURCE GetCurrentDirectory.c GetDriveType.c GetModuleFileName.c + GetVolumeInformation.c interlck.c IsDBCSLeadByteEx.c LoadLibraryExW.c diff --git a/modules/rostests/apitests/kernel32/GetVolumeInformation.c b/modules/rostests/apitests/kernel32/GetVolumeInformation.c new file mode 100644 index 0000000000..7d2cf8bf3f --- /dev/null +++ b/modules/rostests/apitests/kernel32/GetVolumeInformation.c @@ -0,0 +1,127 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for GetVolumeInformation + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> + +static VOID +TestGetVolumeInformationA(VOID) +{ + BOOL Ret; + CHAR Outbuf[MAX_PATH]; + DWORD i, MCL, Flags, Len; + + memset(Outbuf, 0xAA, MAX_PATH); + Ret = GetVolumeInformationA("C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, MAX_PATH); + ok(Ret != FALSE, "GetVolumeInformationA failed: %ld\n", GetLastError()); + for (i = 0; i < MAX_PATH; ++i) + { + if (Outbuf[i] == 0) + { + break; + } + } + ok(i != MAX_PATH, "String was not null terminated!\n"); + + memset(Outbuf, 0xAA, MAX_PATH); + Len = i; + Ret = GetVolumeInformationA("C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, Len + 1); + ok(Ret != FALSE, "GetVolumeInformationA failed: %ld\n", GetLastError()); + for (i = 0; i < MAX_PATH; ++i) + { + if (Outbuf[i] == 0) + { + break; + } + } + ok(i != MAX_PATH, "String was not null terminated!\n"); + ok(i == Len, "String was truncated\n"); + + memset(Outbuf, 0xAA, MAX_PATH); + Len = i; + SetLastError(0xdeadbeef); + Ret = GetVolumeInformationA("C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, Len); + ok(Ret != TRUE, "GetVolumeInformationA succeed\n"); + ok(GetLastError() == ERROR_BAD_LENGTH, "Expected ERROR_BAD_LENGTH error, got %ld\n", GetLastError()); + ok(Outbuf[0] != 0xAA, "Output buffer was not written to\n"); + for (i = 0; i < MAX_PATH; ++i) + { + if (Outbuf[i] == 0) + { + break; + } + } + ok(i == MAX_PATH, "String was null terminated!\n"); + for (i = 0; i < MAX_PATH; ++i) + { + if (Outbuf[i] != 0xAA) + { + break; + } + } + ok(i != MAX_PATH, "String was not written to!\n"); + ok(i < Len, "Buffer has been overruned\n"); +} + +static VOID +TestGetVolumeInformationW(VOID) +{ + BOOL Ret; + WCHAR Outbuf[MAX_PATH]; + DWORD i, MCL, Flags, Len; + + memset(Outbuf, 0xAA, MAX_PATH); + Ret = GetVolumeInformationW(L"C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, MAX_PATH); + ok(Ret != FALSE, "GetVolumeInformationW failed: %ld\n", GetLastError()); + for (i = 0; i < MAX_PATH; ++i) + { + if (Outbuf[i] == 0) + { + break; + } + } + ok(i != MAX_PATH, "String was not null terminated!\n"); + + memset(Outbuf, 0xAA, MAX_PATH); + Len = i; + Ret = GetVolumeInformationW(L"C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, Len + 1); + ok(Ret != FALSE, "GetVolumeInformationW failed: %ld\n", GetLastError()); + for (i = 0; i < MAX_PATH; ++i) + { + if (Outbuf[i] == 0) + { + break; + } + } + ok(i != MAX_PATH, "String was not null terminated!\n"); + ok(i == Len, "String was truncated\n"); + + memset(Outbuf, 0xAA, MAX_PATH); + Len = i; + SetLastError(0xdeadbeef); + Ret = GetVolumeInformationW(L"C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, Len); + ok(Ret != TRUE, "GetVolumeInformationW succeed\n"); + ok(GetLastError() == ERROR_BAD_LENGTH, "Expected ERROR_BAD_LENGTH error, got %ld\n", GetLastError()); + ok(Outbuf[0] != 0xAA, "Output buffer was not written to\n"); + for (i = 0; i < MAX_PATH; ++i) + { + if (Outbuf[i] == 0) + { + break; + } + } + ok(i != MAX_PATH, "String was not null terminated!\n"); + ok(i >= Len, "Buffer has not been overruned\n"); +} + +START_TEST(GetVolumeInformation) +{ + TestGetVolumeInformationW(); + TestGetVolumeInformationA(); +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 72e3ef973a..f00b9e99a6 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -14,6 +14,7 @@ extern void func_GetComputerNameEx(void); extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); extern void func_GetModuleFileName(void); +extern void func_GetVolumeInformation(void); extern void func_interlck(void); extern void func_IsDBCSLeadByteEx(void); extern void func_LoadLibraryExW(void); @@ -42,6 +43,7 @@ const struct test winetest_testlist[] = { "GetCurrentDirectory", func_GetCurrentDirectory }, { "GetDriveType", func_GetDriveType }, { "GetModuleFileName", func_GetModuleFileName }, + { "GetVolumeInformation", func_GetVolumeInformation }, { "interlck", func_interlck }, { "IsDBCSLeadByteEx", func_IsDBCSLeadByteEx }, { "LoadLibraryExW", func_LoadLibraryExW },

7 years, 2 months

[reactos] 01/02: [KERNEL32] Fix buffer size for allocation in GetVolumeInformationW(). This fixes function failing with big enough buffer.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bfc68cc14a4fd157f5f6… commit 5bfc68cc14a4fd157f5f6df716648ac67542e528 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 15 10:43:49 2017 +0200 [KERNEL32] Fix buffer size for allocation in GetVolumeInformationW(). This fixes function failing with big enough buffer. --- dll/win32/kernel32/client/file/volume.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/kernel32/client/file/volume.c b/dll/win32/kernel32/client/file/volume.c index 90016b8e08..ba0ef82f5d 100644 --- a/dll/win32/kernel32/client/file/volume.c +++ b/dll/win32/kernel32/client/file/volume.c @@ -253,6 +253,10 @@ GetVolumeInformationW(IN LPCWSTR lpRootPathName, RootPathName = lpRootPathName; } + /* Convert length to bytes */ + nVolumeNameSize *= sizeof(WCHAR); + nFileSystemNameSize *= sizeof(WCHAR); + /* Convert to NT name */ if (!RtlDosPathNameToNtPathName_U(RootPathName, &NtPathName, NULL, NULL)) {

7 years, 2 months

[reactos] 01/01: [STORORT] Allocate the miniport device extension and use it the calls to HwFindAdapter and HwInitialize. CORE-13866

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42cb5353b8ce9c85c0461… commit 42cb5353b8ce9c85c04615beca9bab6245454153 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 15 00:06:22 2017 +0200 [STORORT] Allocate the miniport device extension and use it the calls to HwFindAdapter and HwInitialize. CORE-13866 --- drivers/storage/port/storport/fdo.c | 11 ++++++++--- drivers/storage/port/storport/miniport.c | 32 +++++++++++++++++++++++++++++--- drivers/storage/port/storport/precomp.h | 14 +++++++++++--- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index be6b693694..6338c48d12 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -38,9 +38,14 @@ PortFdoStartMiniport( return STATUS_NO_SUCH_DEVICE; /* Initialize the miniport */ - MiniportInitialize(&DeviceExtension->Miniport, - DeviceExtension, - InitData); + Status = MiniportInitialize(&DeviceExtension->Miniport, + DeviceExtension, + InitData); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MiniportInitialize() failed (Status 0x%08lx)\n", Status); + return Status; + } /* Call the miniports FindAdapter function */ Status = MiniportFindAdapter(&DeviceExtension->Miniport); diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index 8e1346fe8b..4e0b37e182 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -15,14 +15,38 @@ /* FUNCTIONS ******************************************************************/ -VOID +NTSTATUS MiniportInitialize( _In_ PMINIPORT Miniport, _In_ PFDO_DEVICE_EXTENSION DeviceExtension, _In_ PHW_INITIALIZATION_DATA InitData) { + PMINIPORT_DEVICE_EXTENSION MiniportExtension; + ULONG Size; + + DPRINT1("MiniportInitialize(%p %p %p)\n", + Miniport, DeviceExtension, InitData); + Miniport->DeviceExtension = DeviceExtension; Miniport->InitData = InitData; + + /* Calculate the miniport device extension size */ + Size = sizeof(MINIPORT_DEVICE_EXTENSION) + + Miniport->InitData->DeviceExtensionSize; + + /* Allocate and initialize the miniport device extension */ + MiniportExtension = ExAllocatePoolWithTag(NonPagedPool, + Size, + TAG_MINIPORT_DATA); + if (MiniportExtension == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(MiniportExtension, Size); + + MiniportExtension->Miniport = Miniport; + Miniport->MiniportExtension = MiniportExtension; + + return STATUS_SUCCESS; } @@ -36,7 +60,8 @@ MiniportFindAdapter( DPRINT1("MiniportFindAdapter(%p)\n", Miniport); - Result = Miniport->InitData->HwFindAdapter(NULL, + /* Call the miniport HwFindAdapter routine */ + Result = Miniport->InitData->HwFindAdapter(&Miniport->MiniportExtension->HwDeviceExtension, NULL, NULL, NULL, @@ -84,7 +109,8 @@ MiniportHwInitialize( DPRINT1("MiniportHwInitialize(%p)\n", Miniport); - Status = Miniport->InitData->HwInitialize(NULL); + /* Call the miniport HwInitialize routine */ + Status = Miniport->InitData->HwInitialize(&Miniport->MiniportExtension->HwDeviceExtension); DPRINT1("HwInitialize() returned 0x%08lx\n", Status); return Status; diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index fc1224e851..350ca6854d 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -23,8 +23,9 @@ #include <wdmguid.h> /* Memory Tags */ -#define TAG_GLOBAL_DATA 'DGtS' -#define TAG_INIT_DATA 'DItS' +#define TAG_GLOBAL_DATA 'DGtS' +#define TAG_INIT_DATA 'DItS' +#define TAG_MINIPORT_DATA 'DMtS' typedef enum { @@ -61,10 +62,17 @@ typedef struct _DRIVER_OBJECT_EXTENSION LIST_ENTRY InitDataListHead; } DRIVER_OBJECT_EXTENSION, *PDRIVER_OBJECT_EXTENSION; +typedef struct _MINIPORT_DEVICE_EXTENSION +{ + struct _MINIPORT *Miniport; + UCHAR HwDeviceExtension[0]; +} MINIPORT_DEVICE_EXTENSION, *PMINIPORT_DEVICE_EXTENSION; + typedef struct _MINIPORT { struct _FDO_DEVICE_EXTENSION *DeviceExtension; PHW_INITIALIZATION_DATA InitData; + PMINIPORT_DEVICE_EXTENSION MiniportExtension; } MINIPORT, *PMINIPORT; typedef struct _FDO_DEVICE_EXTENSION @@ -107,7 +115,7 @@ PortFdoPnp( /* miniport.c */ -VOID +NTSTATUS MiniportInitialize( _In_ PMINIPORT Miniport, _In_ PFDO_DEVICE_EXTENSION DeviceExtension,

7 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017