Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 12:39:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBSTOR] Properly handle IRP_MN_QUERY_DEVICE_RELATIONS(BusRelations) for FDO.

Browse source 
This fixes Driver Verifier warnings
This commit is contained in:
Victor Perevertkin 2019-06-11 02:50:43 +03:00
parent 04409942d6
commit da1b08e842
1 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/usb/usbstor/fdo.c
View file

@ -5,6 +5,7 @@
* COPYRIGHT: 2005-2006 James Tabor * COPYRIGHT: 2005-2006 James Tabor
* 2011-2012 Michael Martin (michael.martin@reactos.org) * 2011-2012 Michael Martin (michael.martin@reactos.org)
* 2011-2013 Johannes Anderwald (johannes.anderwald@reactos.org) * 2011-2013 Johannes Anderwald (johannes.anderwald@reactos.org)
* 2019 Victor Perevertkin (victor.perevertkin@reactos.org)
*/ */
#include "usbstor.h" #include "usbstor.h"
@ -45,46 +46,49 @@ USBSTOR_FdoHandleDeviceRelations(
IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack = IoGetCurrentIrpStackLocation(Irp);
// check if relation type is BusRelations // FDO always only handles bus relations
if (IoStack->Parameters.QueryDeviceRelations.Type != BusRelations) if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations)
{ {
// FDO always only handles bus relations // go through array and count device objects
return USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++)
}
// go through array and count device objects
for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++)
{
if (DeviceExtension->ChildPDO[Index])
{ {
DeviceCount++; if (DeviceExtension->ChildPDO[Index])
{
DeviceCount++;
}
} }
}
DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? (DeviceCount-1) * sizeof(PDEVICE_OBJECT) : 0)); DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? (DeviceCount-1) * sizeof(PDEVICE_OBJECT) : 0));
if (!DeviceRelations) if (!DeviceRelations)
{
return STATUS_INSUFFICIENT_RESOURCES;
}
// add device objects
for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++)
{
if (DeviceExtension->ChildPDO[Index])
{ {
// store child pdo Irp->IoStatus.Information = 0;
DeviceRelations->Objects[DeviceRelations->Count] = DeviceExtension->ChildPDO[Index]; Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
// add reference return STATUS_INSUFFICIENT_RESOURCES;
ObReferenceObject(DeviceExtension->ChildPDO[Index]);
DeviceRelations->Count++;
} }
// add device objects
for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++)
{
if (DeviceExtension->ChildPDO[Index])
{
// store child pdo
DeviceRelations->Objects[DeviceRelations->Count] = DeviceExtension->ChildPDO[Index];
// add reference
ObReferenceObject(DeviceExtension->ChildPDO[Index]);
DeviceRelations->Count++;
}
}
Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations;
Irp->IoStatus.Status = STATUS_SUCCESS;
} }
Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; IoCopyCurrentIrpStackLocationToNext(Irp);
return STATUS_SUCCESS; return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp);
} }
NTSTATUS NTSTATUS
@ -291,9 +295,8 @@ USBSTOR_FdoHandlePnp(
} }
case IRP_MN_QUERY_DEVICE_RELATIONS: case IRP_MN_QUERY_DEVICE_RELATIONS:
{ {
DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS %p\n", DeviceObject); DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS %p Type: %u\n", DeviceObject, IoStack->Parameters.QueryDeviceRelations.Type);
Status = USBSTOR_FdoHandleDeviceRelations(DeviceExtension, Irp); return USBSTOR_FdoHandleDeviceRelations(DeviceExtension, Irp);
break;
} }
case IRP_MN_STOP_DEVICE: case IRP_MN_STOP_DEVICE:
{ {