Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
- Raise the IRQL when enumerating device lists so it doesn't get edited mid-listing
- Don't hardcode the pointer size when checking the buffer size

svn path=/trunk/; revision=70408
This commit is contained in:
Ged Murphy 2015-12-23 11:26:28 +00:00
parent cf2573f733
commit 645acc270a
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/ntoskrnl/io/iomgr/device.c
View file

@ -1088,6 +1088,10 @@ IoEnumerateDeviceObjectList(IN PDRIVER_OBJECT DriverObject,
{ {
ULONG ActualDevices = 1; ULONG ActualDevices = 1;
PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject;
KIRQL OldIrql;
/* Raise to dispatch level */
KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
/* Find out how many devices we'll enumerate */ /* Find out how many devices we'll enumerate */
while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++;
@ -1099,13 +1103,14 @@ IoEnumerateDeviceObjectList(IN PDRIVER_OBJECT DriverObject,
*ActualNumberDeviceObjects = ActualDevices; *ActualNumberDeviceObjects = ActualDevices;
/* Check if we can support so many */ /* Check if we can support so many */
if ((ActualDevices * 4) > DeviceObjectListSize) if ((ActualDevices * sizeof(PDEVICE_OBJECT)) > DeviceObjectListSize)
{ {
/* Fail because the buffer was too small */ /* Fail because the buffer was too small */
KeLowerIrql(OldIrql);
return STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL;
} }
/* Check if the caller only wanted the size */ /* Check if the caller wanted the device list */
if (DeviceObjectList) if (DeviceObjectList)
{ {
/* Loop through all the devices */ /* Loop through all the devices */
@ -1124,6 +1129,9 @@ IoEnumerateDeviceObjectList(IN PDRIVER_OBJECT DriverObject,
} }
} }
/* Return back to previous IRQL */
KeLowerIrql(OldIrql);
/* Return the status */ /* Return the status */
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }