Ros-diffs

ros-diffs@reactos.org

81390 discussions

[vmikayelyan] 72392: usb: HUB: Fix DV's enhanced I/O validation issues Added USBHUB_DispatchSystemControl stub
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:55:09 2016 New Revision: 72392 URL: http://svn.reactos.org/svn/reactos?rev=72392&view=rev Log: usb: HUB: Fix DV's enhanced I/O validation issues Added USBHUB_DispatchSystemControl stub Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:55:09 2016 @@ -1626,7 +1626,7 @@ RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; // Send the StartDevice to RootHub - Status = ForwardIrpAndWait(RootHubDeviceObject, Irp); + Status = ForwardIrpAndWait(HubDeviceExtension->LowerDeviceObject, Irp); if (!NT_SUCCESS(Status)) { Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:55:09 2016 @@ -62,7 +62,7 @@ PDEVICE_OBJECT DeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; NTSTATUS Status; - DPRINT("USBHUB: AddDevice\n"); + DPRINT("USBHUB: AddDevice (%p)\n", PhysicalDeviceObject); // // Create the Device Object // @@ -167,6 +167,18 @@ } NTSTATUS NTAPI +USBHUB_DispatchSystemControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT("Usbhub: DispatchSystemControl\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return USBHUB_IrpStub(DeviceObject, Irp); + else + return USBHUB_IrpStub(DeviceObject, Irp); +} + +NTSTATUS NTAPI USBHUB_DispatchInternalDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -275,6 +287,7 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = USBHUB_Cleanup; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBHUB_DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = USBHUB_DispatchSystemControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBHUB_DispatchInternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = USBHUB_DispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] =USBHUB_DispatchPower;

1 0

[vmikayelyan] 72391: usb: HUB: Refactor power dispatcher, add remove synch Refactored power dispatcher, added remove sychronization to avoid early remove or call on removed device.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:52:21 2016 New Revision: 72391 URL: http://svn.reactos.org/svn/reactos?rev=72391&view=rev Log: usb: HUB: Refactor power dispatcher, add remove synch Refactored power dispatcher, added remove sychronization to avoid early remove or call on removed device. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:52:21 2016 @@ -197,45 +197,58 @@ { PIO_STACK_LOCATION IoStack; PHUB_DEVICE_EXTENSION DeviceExtension; - + NTSTATUS Status; IoStack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = DeviceObject->DeviceExtension; + + Status = IoAcquireRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + DPRINT1("Power Function %x\n", IoStack->MinorFunction); if (DeviceExtension->Common.IsFDO) { PoStartNextPowerIrp(Irp); IoSkipCurrentIrpStackLocation(Irp); - return PoCallDriver(DeviceExtension->LowerDeviceObject, Irp); - } - - if (IoStack->MinorFunction == IRP_MN_SET_POWER) - { - PoStartNextPowerIrp(Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - - } - else if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) - { - PoStartNextPowerIrp(Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - - } - else if (IoStack->MinorFunction == IRP_MN_WAIT_WAKE) - { - PoStartNextPowerIrp(Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + Status = PoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + IoReleaseRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); + return Status; + } + + switch (IoStack->MinorFunction) + { + case IRP_MN_SET_POWER: + { + DPRINT("IRP_MN_SET_POWER\n"); + break; + } + case IRP_MN_QUERY_POWER: + { + DPRINT("IRP_MN_QUERY_POWER\n"); + break; + } + case IRP_MN_WAIT_WAKE: + { + DPRINT("IRP_MN_WAIT_WAKE\n"); + break; + } + default: + { + DPRINT1("PDO IRP_MJ_POWER / unknown minor function 0x%lx\n", IoStack->MinorFunction); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Irp->IoStatus.Status; + } } PoStartNextPowerIrp(Irp); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&DeviceExtension->Common.RemoveLock, Irp); return STATUS_SUCCESS; }

1 0

[vmikayelyan] 72390: usb: HUB: FDO: Add IRP_MN_REMOVE_DEVICE handler Added remove handler for usbhub FDO. When FDO is being removed, it should delete all it's child PDOs. Because when PnP sends rem...
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:50:26 2016 New Revision: 72390 URL: http://svn.reactos.org/svn/reactos?rev=72390&view=rev Log: usb: HUB: FDO: Add IRP_MN_REMOVE_DEVICE handler Added remove handler for usbhub FDO. When FDO is being removed, it should delete all it's child PDOs. Because when PnP sends removes to child devices they are still presented on the bus, so their handler will not delete PDO. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:50:26 2016 @@ -2034,10 +2034,12 @@ NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT ChildDeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; + PUSB_BUS_INTERFACE_HUB_V5 HubInterface; PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + HubInterface = &HubDeviceExtension->HubInterface; Stack = IoGetCurrentIrpStackLocation(Irp); Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); @@ -2175,15 +2177,69 @@ } case IRP_MN_REMOVE_DEVICE: { - // Should be reworked later in this commits set DPRINT("IRP_MN_REMOVE_DEVICE\n"); + + SET_NEW_PNP_STATE(HubDeviceExtension->Common, Deleted); + + IoReleaseRemoveLockAndWait(&HubDeviceExtension->Common.RemoveLock, Irp); + + // + // Here we should remove all child PDOs. At this point all children + // received and returned from IRP_MN_REMOVE so remove synchronization + // isn't needed here + // + + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); + + for (int i = 0; i < USB_MAXCHILDREN; i++) + { + ChildDeviceObject = HubDeviceExtension->ChildDeviceObject[i]; + if (ChildDeviceObject) + { + PHUB_CHILDDEVICE_EXTENSION UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceExtension; + + SET_NEW_PNP_STATE(UsbChildExtension->Common, Deleted); + + // Remove the usb device + if (UsbChildExtension->UsbDeviceHandle) + { + Status = HubInterface->RemoveUsbDevice(HubInterface->BusContext, UsbChildExtension->UsbDeviceHandle, 0); + ASSERT(Status == STATUS_SUCCESS); + } + + // Free full configuration descriptor + if (UsbChildExtension->FullConfigDesc) + ExFreePool(UsbChildExtension->FullConfigDesc); + + // Free ID buffers + if (UsbChildExtension->usCompatibleIds.Buffer) + ExFreePool(UsbChildExtension->usCompatibleIds.Buffer); + + if (UsbChildExtension->usDeviceId.Buffer) + ExFreePool(UsbChildExtension->usDeviceId.Buffer); + + if (UsbChildExtension->usHardwareIds.Buffer) + ExFreePool(UsbChildExtension->usHardwareIds.Buffer); + + if (UsbChildExtension->usInstanceId.Buffer) + ExFreePool(UsbChildExtension->usInstanceId.Buffer); + + DPRINT("Deleting child PDO\n"); + IoDeleteDevice(DeviceObject); + ChildDeviceObject = NULL; + } + } + + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); + Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = ForwardIrpAndForget(DeviceObject, Irp); IoDetachDevice(HubDeviceExtension->LowerDeviceObject); + DPRINT("Deleting FDO 0x%p\n", DeviceObject); IoDeleteDevice(DeviceObject); - return STATUS_SUCCESS; + return Status; } case IRP_MN_QUERY_BUS_INFORMATION: {

1 0

[vmikayelyan] 72389: usb: hub: Add remove synchronization Added PDO/FDO remove synchronization to prevent device removal while another IRP is in process. As guidelines used ch6 of Walter Oney's "Pr...
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:47:45 2016 New Revision: 72389 URL: http://svn.reactos.org/svn/reactos?rev=72389&view=rev Log: usb: hub: Add remove synchronization Added PDO/FDO remove synchronization to prevent device removal while another IRP is in process. As guidelines used ch6 of Walter Oney's "Programming the Microsoft Windows Driver Model 2ed" Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:47:45 2016 @@ -1323,6 +1323,8 @@ UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); INITIALIZE_PNP_STATE(UsbChildExtension->Common); + + IoInitializeRemoveLock(&UsbChildExtension->Common.RemoveLock, 'pbuH', 0, 0); KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); @@ -2038,6 +2040,14 @@ Stack = IoGetCurrentIrpStackLocation(Irp); + Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + switch (Stack->MinorFunction) { case IRP_MN_START_DEVICE: @@ -2057,6 +2067,7 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); return Status; } @@ -2083,6 +2094,7 @@ // We should fail an IRP Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); return Status; } @@ -2201,7 +2213,9 @@ } } - return ForwardIrpAndForget(DeviceObject, Irp); + Status = ForwardIrpAndForget(DeviceObject, Irp); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + return Status; } NTSTATUS @@ -2225,6 +2239,25 @@ // get device extension HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + Status = IoAcquireRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + // Prevent handling of control requests in remove pending state + if (HubDeviceExtension->Common.PnPState == RemovePending) + { + DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject); + Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); + return STATUS_DEVICE_NOT_CONNECTED; + } + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_INFORMATION) { // is the buffer big enough @@ -2390,6 +2423,7 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&HubDeviceExtension->Common.RemoveLock, Irp); return Status; } Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:47:45 2016 @@ -200,6 +200,14 @@ ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); + Status = IoAcquireRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + if (ChildDeviceExtension->Common.PnPState == SurpriseRemovePending || ChildDeviceExtension->Common.PnPState == RemovePending || !IsValidPDO(DeviceObject)) @@ -209,6 +217,7 @@ Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return STATUS_DEVICE_NOT_CONNECTED; } @@ -314,6 +323,7 @@ // Send the request to RootHub // Status = FowardUrbToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Irp, Urb, NULL); + IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return Status; } // @@ -410,6 +420,7 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); } + IoReleaseRemoveLock(&ChildDeviceExtension->Common.RemoveLock, Irp); return Status; } @@ -583,6 +594,14 @@ UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; + + Status = IoAcquireRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } switch (MinorFunction) { @@ -682,6 +701,8 @@ // Parent or child device was surprise removed, freeing resources allocated for child device. SET_NEW_PNP_STATE(UsbChildExtension->Common, Deleted); + IoReleaseRemoveLockAndWait(&UsbChildExtension->Common.RemoveLock, Irp); + // Remove the usb device if (UsbChildExtension->UsbDeviceHandle) { @@ -705,8 +726,12 @@ if (UsbChildExtension->usInstanceId.Buffer) ExFreePool(UsbChildExtension->usInstanceId.Buffer); - // Delete child PDO + DPRINT("Deleting child PDO\n"); IoDeleteDevice(DeviceObject); + } + else + { + IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); } // If device is physically presented, we leave its PDO undeleted. @@ -802,7 +827,9 @@ // pass irp down IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(UsbChildExtension->ParentDeviceObject, Irp); + Status = IoCallDriver(UsbChildExtension->ParentDeviceObject, Irp); + IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); + return Status; } case IRP_MN_SURPRISE_REMOVAL: { @@ -825,6 +852,8 @@ Status = Irp->IoStatus.Status; } } + + IoReleaseRemoveLock(&UsbChildExtension->Common.RemoveLock, Irp); Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:47:45 2016 @@ -97,6 +97,9 @@ // initialize mutex KeInitializeGuardedMutex(&HubDeviceExtension->HubMutexLock); + // initialize remove lock + IoInitializeRemoveLock(&HubDeviceExtension->Common.RemoveLock, 'buH', 0, 0); + // // initialize reset complete event //

1 0

[vmikayelyan] 72388: usb: HUB: Add PnP state tracking Added PDO/FDO PnP state tracking, which is done according MSDN's "State Transitions for PnP Devices" topic.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:46:18 2016 New Revision: 72388 URL: http://svn.reactos.org/svn/reactos?rev=72388&view=rev Log: usb: HUB: Add PnP state tracking Added PDO/FDO PnP state tracking, which is done according MSDN's "State Transitions for PnP Devices" topic. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:46:18 2016 @@ -1322,7 +1322,7 @@ RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->UsbDInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); - UsbChildExtension->IsRemovePending = FALSE; + INITIALIZE_PNP_STATE(UsbChildExtension->Common); KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); @@ -2053,6 +2053,8 @@ Status = USBHUB_ParentFDOStartDevice(DeviceObject, Irp); } + SET_NEW_PNP_STATE(HubDeviceExtension->Common, Started); + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -2116,6 +2118,18 @@ // No action is required from FDO because it have nothing to free. DPRINT("IRP_MN_QUERY_REMOVE_DEVICE\n"); + SET_NEW_PNP_STATE(HubDeviceExtension->Common, RemovePending); + + Irp->IoStatus.Status = STATUS_SUCCESS; + break; + } + case IRP_MN_CANCEL_REMOVE_DEVICE: + { + DPRINT("IRP_MN_CANCEL_REMOVE_DEVICE\n"); + + if (HubDeviceExtension->Common.PnPState == RemovePending) + RESTORE_PREVIOUS_PNP_STATE(HubDeviceExtension->Common); + Irp->IoStatus.Status = STATUS_SUCCESS; break; } @@ -2127,6 +2141,7 @@ // our children that their parent is removed and on next removal // they also can be removed. // + SET_NEW_PNP_STATE(HubDeviceExtension->Common, SurpriseRemovePending); KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:46:18 2016 @@ -200,7 +200,9 @@ ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); - if (ChildDeviceExtension->IsRemovePending || !IsValidPDO(DeviceObject)) + if (ChildDeviceExtension->Common.PnPState == SurpriseRemovePending || + ChildDeviceExtension->Common.PnPState == RemovePending || + !IsValidPDO(DeviceObject)) { // Parent or child device was surprise removed. DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject); @@ -431,6 +433,8 @@ // IoRegisterDeviceInterface(DeviceObject, &GUID_DEVINTERFACE_USB_DEVICE, NULL, &ChildDeviceExtension->SymbolicLinkName); IoSetDeviceInterfaceState(&ChildDeviceExtension->SymbolicLinkName, TRUE); + + SET_NEW_PNP_STATE(ChildDeviceExtension->Common, Started); UNIMPLEMENTED return STATUS_SUCCESS; @@ -668,9 +672,15 @@ DPRINT("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + ASSERT((UsbChildExtension->Common.PnPState == RemovePending) || + (UsbChildExtension->Common.PnPState == SurpriseRemovePending)); + + SET_NEW_PNP_STATE(UsbChildExtension->Common, NotStarted); + if (!IsValidPDO(DeviceObject)) { // Parent or child device was surprise removed, freeing resources allocated for child device. + SET_NEW_PNP_STATE(UsbChildExtension->Common, Deleted); // Remove the usb device if (UsbChildExtension->UsbDeviceHandle) @@ -699,8 +709,7 @@ IoDeleteDevice(DeviceObject); } - // Device is physically presented, so we leave its PDO undeleted. - ASSERT(UsbChildExtension->IsRemovePending == TRUE); + // If device is physically presented, we leave its PDO undeleted. /* Complete the IRP */ Irp->IoStatus.Status = STATUS_SUCCESS; @@ -760,7 +769,7 @@ // UsbChildExtension->DeviceInterface.InterfaceDereference(UsbChildExtension->DeviceInterface.BusContext); - UsbChildExtension->IsRemovePending = TRUE; + SET_NEW_PNP_STATE(UsbChildExtension->Common, RemovePending); /* Sure, no problem */ Status = STATUS_SUCCESS; @@ -770,9 +779,9 @@ case IRP_MN_CANCEL_REMOVE_DEVICE: { // Check to see have we received query-remove before - if (UsbChildExtension->IsRemovePending == TRUE) - { - UsbChildExtension->IsRemovePending = FALSE; + if (UsbChildExtension->Common.PnPState == RemovePending) + { + RESTORE_PREVIOUS_PNP_STATE(UsbChildExtension->Common); UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); } @@ -804,7 +813,7 @@ // the flag and do further clean-up in subsequent IRP_MN_REMOVE_DEVICE // We can receive this IRP when device is physically connected (on stop/start fail). // - UsbChildExtension->IsRemovePending = TRUE; + SET_NEW_PNP_STATE(UsbChildExtension->Common, SurpriseRemovePending); Status = STATUS_SUCCESS; break; Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:46:18 2016 @@ -86,6 +86,8 @@ HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; RtlZeroMemory(HubDeviceExtension, sizeof(HUB_DEVICE_EXTENSION)); + INITIALIZE_PNP_STATE(HubDeviceExtension->Common); + // // Set this to Fdo // Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] Fri Aug 19 16:46:18 2016 @@ -39,9 +39,43 @@ PVOID Context; } WORK_ITEM_DATA, *PWORK_ITEM_DATA; + +// +// Definitions for device's PnP state tracking, all this states are described +// in PnP Device States diagram of DDK documentation. +// +typedef enum _DEVICE_PNP_STATE { + + NotStarted = 0, // Not started + Started, // After handling of START_DEVICE IRP + StopPending, // After handling of QUERY_STOP IRP + Stopped, // After handling of STOP_DEVICE IRP + RemovePending, // After handling of QUERY_REMOVE IRP + SurpriseRemovePending, // After handling of SURPRISE_REMOVE IRP + Deleted, // After handling of REMOVE_DEVICE IRP + UnKnown // Unknown state + +} DEVICE_PNP_STATE; + +#define INITIALIZE_PNP_STATE(Data) \ +(Data).PnPState = NotStarted;\ +(Data).PreviousPnPState = NotStarted; + +#define SET_NEW_PNP_STATE(Data, state) \ +(Data).PnPState = (Data).PnPState;\ +(Data).PnPState = (state); + +#define RESTORE_PREVIOUS_PNP_STATE(Data) \ +(Data).PnPState = (Data).PreviousPnPState; + typedef struct { BOOLEAN IsFDO; + // We'll track device PnP state via this variables + DEVICE_PNP_STATE PnPState; + DEVICE_PNP_STATE PreviousPnPState; + // Remove lock + IO_REMOVE_LOCK RemoveLock; } COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; typedef struct _HUB_CHILDDEVICE_EXTENSION @@ -61,7 +95,6 @@ UNICODE_STRING SymbolicLinkName; USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; USB_DEVICE_INFORMATION_0 DeviceInformation; - BOOLEAN IsRemovePending; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; typedef struct _HUB_DEVICE_EXTENSION

1 0

[vmikayelyan] 72387: usb: hub: FDO: Handle surprise removal, fail stop request.
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:38:11 2016 New Revision: 72387 URL: http://svn.reactos.org/svn/reactos?rev=72387&view=rev Log: usb: hub: FDO: Handle surprise removal, fail stop request. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:38:11 2016 @@ -2030,7 +2030,9 @@ { PIO_STACK_LOCATION Stack; NTSTATUS Status = STATUS_SUCCESS; + PDEVICE_OBJECT ChildDeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -2098,10 +2100,49 @@ } break; } + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // We should fail this request, because we're not handling + // IRP_MN_STOP_DEVICE for now.We'll receive this IRP ONLY when + // PnP manager rebalances resources. + // + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } case IRP_MN_QUERY_REMOVE_DEVICE: - case IRP_MN_QUERY_STOP_DEVICE: - { - DPRINT("IRP_MN_QUERY_STOP_DEVICE\n"); + { + // No action is required from FDO because it have nothing to free. + DPRINT("IRP_MN_QUERY_REMOVE_DEVICE\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + break; + } + case IRP_MN_SURPRISE_REMOVAL: + { + // + // We'll receive this IRP on HUB unexpected removal, or on USB + // controller removal from PCI port. Here we should "let know" all + // our children that their parent is removed and on next removal + // they also can be removed. + // + + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); + + for (int i = 0; i < USB_MAXCHILDREN; i++) + { + ChildDeviceObject = HubDeviceExtension->ChildDeviceObject[i]; + if (ChildDeviceObject) + { + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceObjectExtension; + ChildDeviceExtension->ParentDeviceObject = NULL; + } + } + + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); + + // This IRP can't be failed Irp->IoStatus.Status = STATUS_SUCCESS; break; }

1 0

[vmikayelyan] 72386: usb: hub: Add sychronization for FDO's child list access. As FDO's child list is getting changed not from PnP dispatcher but from DeviceStatusChangeThread(), we need to sychron...
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:36:43 2016 New Revision: 72386 URL: http://svn.reactos.org/svn/reactos?rev=72386&view=rev Log: usb: hub: Add sychronization for FDO's child list access. As FDO's child list is getting changed not from PnP dispatcher but from DeviceStatusChangeThread(), we need to sychronize access for it. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Aug 19 16:36:43 2016 @@ -1094,6 +1094,7 @@ PDEVICE_OBJECT ChildDeviceObject = NULL; ULONG Index = 0; + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); for (Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index]) @@ -1114,14 +1115,16 @@ if (!ChildDeviceObject) { DPRINT1("Removal request for non-existant device!\n"); + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); return STATUS_UNSUCCESSFUL; } DPRINT("Removing device on port %d (Child index: %d)\n", PortId, Index); /* Remove the device from the table */ - // is lock needed? HubDeviceExtension->ChildDeviceObject[Index] = NULL; + + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); /* Invalidate device relations for the root hub */ IoInvalidateDeviceRelations(HubDeviceExtension->RootHubPhysicalDeviceObject, BusRelations); @@ -1153,26 +1156,6 @@ HubInterface = &HubDeviceExtension->HubInterface; RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; HubInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; - // - // Find an empty slot in the child device array - // - for (ChildDeviceCount = 0; ChildDeviceCount < USB_MAXCHILDREN; ChildDeviceCount++) - { - if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) - { - DPRINT("Found unused entry at %d\n", ChildDeviceCount); - break; - } - } - - // - // Check if the limit has been reached for maximum usb devices - // - if (ChildDeviceCount == USB_MAXCHILDREN) - { - DPRINT1("USBHUB: Too many child devices!\n"); - return STATUS_UNSUCCESSFUL; - } while (TRUE) { @@ -1341,8 +1324,35 @@ UsbChildExtension->IsRemovePending = FALSE; + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); + + // + // Find an empty slot in the child device array + // + for (ChildDeviceCount = 0; ChildDeviceCount < USB_MAXCHILDREN; ChildDeviceCount++) + { + if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) + { + DPRINT("Found unused entry at %d\n", ChildDeviceCount); + break; + } + } + + // + // Check if the limit has been reached for maximum usb devices + // + if (ChildDeviceCount == USB_MAXCHILDREN) + { + DPRINT1("USBHUB: Too many child devices!\n"); + Status = STATUS_UNSUCCESSFUL; + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); + UsbChildExtension->DeviceInterface.InterfaceDereference(UsbChildExtension->DeviceInterface.BusContext); + goto Cleanup; + } + HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] = NewChildDeviceObject; HubDeviceExtension->InstanceCount++; + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); IoInvalidateDeviceRelations(RootHubDeviceObject, BusRelations); return STATUS_SUCCESS; @@ -1398,6 +1408,8 @@ HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); + // // Count the number of children // @@ -1418,6 +1430,7 @@ { // We have nothing to add *pDeviceRelations = RelationsFromTop; + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); return STATUS_SUCCESS; } } @@ -1432,6 +1445,7 @@ if (!DeviceRelations) { + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); if (!RelationsFromTop) return STATUS_INSUFFICIENT_RESOURCES; else @@ -1460,6 +1474,8 @@ DeviceRelations->Objects[Children++] = HubDeviceExtension->ChildDeviceObject[i]; } } + + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); // We should do this, because replaced this with our's one if (RelationsFromTop) @@ -2198,6 +2214,7 @@ // sanity checks ASSERT(NodeConnectionInfo); + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); for(Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) @@ -2224,6 +2241,7 @@ } break; } + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); // done Irp->IoStatus.Information = sizeof(USB_NODE_INFORMATION); Status = STATUS_SUCCESS; @@ -2244,6 +2262,7 @@ // sanity checks ASSERT(NodeKey); + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); for(Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index] == NULL) @@ -2283,6 +2302,7 @@ NodeKey->ActualLength = Length + sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME); break; } + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); } } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_NODE_CONNECTION_NAME) Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:36:43 2016 @@ -153,14 +153,18 @@ HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + KeAcquireGuardedMutex(&HubDeviceExtension->HubMutexLock); for(Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index] == DeviceObject) { + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); + /* PDO exists */ return TRUE; } } + KeReleaseGuardedMutex(&HubDeviceExtension->HubMutexLock); /* invalid pdo */ return FALSE; Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.c [iso-8859-1] Fri Aug 19 16:36:43 2016 @@ -92,6 +92,9 @@ HubDeviceExtension->Common.IsFDO = TRUE; DeviceObject->Flags |= DO_POWER_PAGABLE; + // initialize mutex + KeInitializeGuardedMutex(&HubDeviceExtension->HubMutexLock); + // // initialize reset complete event // Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/usbhub.h [iso-8859-1] Fri Aug 19 16:36:43 2016 @@ -72,6 +72,8 @@ PDEVICE_OBJECT ChildDeviceObject[USB_MAXCHILDREN]; PDEVICE_OBJECT RootHubPhysicalDeviceObject; PDEVICE_OBJECT RootHubFunctionalDeviceObject; + + KGUARDED_MUTEX HubMutexLock; ULONG NumberOfHubs; KEVENT ResetComplete;

1 0

[vmikayelyan] 72385: Change CMakLists to use GuardedMutexes
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:35:06 2016 New Revision: 72385 URL: http://svn.reactos.org/svn/reactos?rev=72385&view=rev Log: Change CMakLists to use GuardedMutexes Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/CMakeLists.txt Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Fri Aug 19 16:35:06 2016 @@ -1,5 +1,6 @@ add_definitions(-DDEBUG_MODE) +add_definitions(-DNTDDI_VERSION=0x05020400) include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE

1 0

[vmikayelyan] 72384: usb: hub: PDO: Refernce interface before passing up
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:33:34 2016 New Revision: 72384 URL: http://svn.reactos.org/svn/reactos?rev=72384&view=rev Log: usb: hub: PDO: Refernce interface before passing up Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:33:34 2016 @@ -782,6 +782,7 @@ { DPRINT1("USB_BUS_INTERFACE_USBDI_GUID\n"); RtlCopyMemory(Stack->Parameters.QueryInterface.Interface, &UsbChildExtension->DeviceInterface, Stack->Parameters.QueryInterface.Size); + UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); Status = STATUS_SUCCESS; break; }

1 0

[vmikayelyan] 72383: usb: hub: PDO: Added query-remove and query-cancel-remove handlers On IRP_MN_QUERY_REMOVE_DEVICE we are freeing interface obtained from bottom according MSDN we should check in...
by vmikayelyan＠svn.reactos.org 19 Aug '16

19 Aug '16

Author: vmikayelyan Date: Fri Aug 19 16:30:53 2016 New Revision: 72383 URL: http://svn.reactos.org/svn/reactos?rev=72383&view=rev Log: usb: hub: PDO: Added query-remove and query-cancel-remove handlers On IRP_MN_QUERY_REMOVE_DEVICE we are freeing interface obtained from bottom according MSDN we should check interfaces provided to top, but here we are not checking. All checking will be performed in roothub driver's IRP_MN_QUERY_REMOVE_DEVICE handler. This will make problems when buggy driver is loaded on top of us. But we decided to keep source simpler, because in any case buggy driver will prevent removing of whole stack. Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c Modified: branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/USB/drivers/usb/usbhu… ============================================================================== --- branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/GSoC_2016/USB/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Aug 19 16:30:53 2016 @@ -745,14 +745,34 @@ } case IRP_MN_QUERY_REMOVE_DEVICE: { - // HERE SHOULD BE CHECKED INTERFACE COUNT PROVIED TO UPPER LAYER TO BE ZERO, AS WE ARE HANDLING - // IRP_MN_QUERY_INTERFACE IN WRONG WAY, THAT WILL BE DONE LATER. SEE MSDN "IRP_MN_QUERY_INTERFACE" + // + // Free interface obtained from bottom, according MSDN we should + // check interfaces provided to top, but here we are not checking. + // All checking will be performed in roothub driver's + // IRP_MN_QUERY_REMOVE_DEVICE handler. This will make problems when + // buggy driver is loaded on top of us. But we decided to keep source + // simpler, because in any case buggy driver will prevent removing of + // whole stack. + // + UsbChildExtension->DeviceInterface.InterfaceDereference(UsbChildExtension->DeviceInterface.BusContext); UsbChildExtension->IsRemovePending = TRUE; /* Sure, no problem */ Status = STATUS_SUCCESS; Information = 0; + break; + } + case IRP_MN_CANCEL_REMOVE_DEVICE: + { + // Check to see have we received query-remove before + if (UsbChildExtension->IsRemovePending == TRUE) + { + UsbChildExtension->IsRemovePending = FALSE; + UsbChildExtension->DeviceInterface.InterfaceReference(UsbChildExtension->DeviceInterface.BusContext); + } + + Status = STATUS_SUCCESS; break; } case IRP_MN_QUERY_INTERFACE:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs