Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOSKRNL]

Browse source 
- Fix kernel memory corruption when a driver fails to initialize
- Fix a handle leak in a failure case

svn path=/trunk/; revision=55887
This commit is contained in:
Cameron Gutman 2012-02-27 19:31:11 +00:00
parent c61e296b73
commit ac6c5a4738
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1538,6 +1538,10 @@ try_again:
KernelMode, KernelMode,
(PVOID*)&DriverObject, (PVOID*)&DriverObject,
NULL); NULL);
/* Close the extra handle */
ZwClose(hDriver);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* Fail */ /* Fail */
@ -1546,9 +1550,6 @@ try_again:
return Status; return Status;
} }
/* Close the extra handle */
ZwClose(hDriver);
DriverObject->HardwareDatabase = &IopHardwareDatabaseKey; DriverObject->HardwareDatabase = &IopHardwareDatabaseKey;
DriverObject->DriverStart = ModuleObject ? ModuleObject->DllBase : 0; DriverObject->DriverStart = ModuleObject ? ModuleObject->DllBase : 0;
DriverObject->DriverSize = ModuleObject ? ModuleObject->SizeOfImage : 0; DriverObject->DriverSize = ModuleObject ? ModuleObject->SizeOfImage : 0;
@ -1564,6 +1565,7 @@ try_again:
DriverObject->DriverSection = NULL; DriverObject->DriverSection = NULL;
ObMakeTemporaryObject(DriverObject); ObMakeTemporaryObject(DriverObject);
ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject);
return Status;
} }
else else
{ {