Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:PNP] Avoid recursion when walking the device tree.

Browse source
This commit is contained in:
Thomas Faber 2023-01-14 17:40:14 -05:00
parent 3dd3d10531
commit c0e7eaf403
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
ntoskrnl/io/pnpmgr/plugplay.c
View file

@ -18,6 +18,12 @@ typedef struct _PNP_EVENT_ENTRY
PLUGPLAY_EVENT_BLOCK Event;
} PNP_EVENT_ENTRY, *PPNP_EVENT_ENTRY;
typedef struct _IOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT
{
PCUNICODE_STRING InstancePath;
PDEVICE_OBJECT DeviceObject;
} IOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT, *PIOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT;
/* GLOBALS *******************************************************************/
@ -88,39 +94,32 @@ IopQueueTargetDeviceEvent(const GUID *Guid,
return STATUS_SUCCESS;
}
static PDEVICE_OBJECT
IopTraverseDeviceNode(PDEVICE_NODE Node, PUNICODE_STRING DeviceInstance)
NTSTATUS
IopFindDeviceInstanceTraverse(
_In_ PDEVICE_NODE DeviceNode,
_Inout_ PVOID Context)
{
PDEVICE_OBJECT DeviceObject;
PDEVICE_NODE ChildNode;
PIOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT DeviceInstanceContext = Context;
if (RtlEqualUnicodeString(&Node->InstancePath,
DeviceInstance, TRUE))
if (RtlEqualUnicodeString(&DeviceNode->InstancePath,
DeviceInstanceContext->InstancePath, TRUE))
{
ObReferenceObject(Node->PhysicalDeviceObject);
return Node->PhysicalDeviceObject;
ObReferenceObject(DeviceNode->PhysicalDeviceObject);
DeviceInstanceContext->DeviceObject = DeviceNode->PhysicalDeviceObject;
/* Stop enumeration */
return STATUS_UNSUCCESSFUL;
}
/* Traversal of all children nodes */
for (ChildNode = Node->Child;
ChildNode != NULL;
ChildNode = ChildNode->Sibling)
{
DeviceObject = IopTraverseDeviceNode(ChildNode, DeviceInstance);
if (DeviceObject != NULL)
{
return DeviceObject;
}
}
return NULL;
return STATUS_SUCCESS;
}
PDEVICE_OBJECT
IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance)
{
DEVICETREE_TRAVERSE_CONTEXT Context;
IOP_FIND_DEVICE_INSTANCE_TRAVERSE_CONTEXT DeviceInstanceContext;
if (IopRootDeviceNode == NULL)
return NULL;
@ -136,7 +135,17 @@ IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance)
return NULL;
}
return IopTraverseDeviceNode(IopRootDeviceNode, DeviceInstance);
/* Traverse the device tree to find the matching device node */
DeviceInstanceContext.InstancePath = DeviceInstance;
DeviceInstanceContext.DeviceObject = NULL;
IopInitDeviceTreeTraverseContext(&Context,
IopRootDeviceNode,
IopFindDeviceInstanceTraverse,
&DeviceInstanceContext);
(void)IopTraverseDeviceTree(&Context);
/* In case of error or instance not found, this will still be NULL from above. */
return DeviceInstanceContext.DeviceObject;
}
static NTSTATUS