Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 17:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

- IopUnloadDriver: Only add the DOE_UNLOAD_PENDING to the Device's DeviceExtensions Flags and check for attached devices and reference counts if the DriverObject->DriverUnload is valid. Verified on XP.

Browse source 
- IopLoadUnloadDriver: Add a check to verify that ImagePath.Buffer is non null before freeing it. 

svn path=/trunk/; revision=41314
This commit is contained in:
Michael Martin 2009-06-07 01:18:15 +00:00
parent 1163e01722
commit fddbec411f
1 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

60
reactos/ntoskrnl/io/iomgr/driver.c
View file

@ -1083,35 +1083,6 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers)
ExFreePool(ImagePath.Buffer); ExFreePool(ImagePath.Buffer);
/* Loop through each device object of the driver
and set DOE_UNLOAD_PENDING flag */
DeviceObject = DriverObject->DeviceObject;
while (DeviceObject)
{
/* Set the unload pending flag for the device */
DeviceExtension = IoGetDevObjExtension(DeviceObject);
DeviceExtension->ExtensionFlags |= DOE_UNLOAD_PENDING;
/* Make sure there are no attached devices or no reference counts */
if ((DeviceObject->ReferenceCount) || (DeviceObject->AttachedDevice))
{
/* Not safe to unload */
DPRINT1("Drivers device object is referenced or has attached devices\n");
SafeToUnload = FALSE;
}
DeviceObject = DeviceObject->NextDevice;
}
/* If not safe to unload, then return success */
if (!SafeToUnload)
{
ObDereferenceObject(DriverObject);
return STATUS_SUCCESS;
}
/* /*
* Unload the module and release the references to the device object * Unload the module and release the references to the device object
*/ */
@ -1119,6 +1090,34 @@ IopUnloadDriver(PUNICODE_STRING DriverServiceName, BOOLEAN UnloadPnpDrivers)
/* Call the load/unload routine, depending on current process */ /* Call the load/unload routine, depending on current process */
if (DriverObject->DriverUnload && DriverObject->DriverSection) if (DriverObject->DriverUnload && DriverObject->DriverSection)
{ {
/* Loop through each device object of the driver
and set DOE_UNLOAD_PENDING flag */
DeviceObject = DriverObject->DeviceObject;
while (DeviceObject)
{
/* Set the unload pending flag for the device */
DeviceExtension = IoGetDevObjExtension(DeviceObject);
DeviceExtension->ExtensionFlags |= DOE_UNLOAD_PENDING;
/* Make sure there are no attached devices or no reference counts */
if ((DeviceObject->ReferenceCount) || (DeviceObject->AttachedDevice))
{
/* Not safe to unload */
DPRINT1("Drivers device object is referenced or has attached devices\n");
SafeToUnload = FALSE;
}
DeviceObject = DeviceObject->NextDevice;
}
/* If not safe to unload, then return success */
if (!SafeToUnload)
{
ObDereferenceObject(DriverObject);
return STATUS_SUCCESS;
}
/* Set the unload invoked flag */ /* Set the unload invoked flag */
DriverObject->Flags |= DRVO_UNLOAD_INVOKED; DriverObject->Flags |= DRVO_UNLOAD_INVOKED;
@ -1681,7 +1680,8 @@ IopLoadUnloadDriver(PLOAD_UNLOAD_PARAMS LoadParams)
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status);
ExFreePool(ImagePath.Buffer); if (ImagePath.Buffer)
ExFreePool(ImagePath.Buffer);
LoadParams->Status = Status; LoadParams->Status = Status;
(VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE);
return; return;