Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 12:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed memory corruption in IopInitializeBuiltinDriver.

Browse source 
[Should be ported to 0.2.3 release branch too.]

svn path=/trunk/; revision=9733
This commit is contained in:
Filip Navara 2004-06-20 00:44:55 +00:00
parent 46f51fc218
commit ce56ff1648
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/ntoskrnl/io/driver.c
View file

@ -1,4 +1,4 @@
/* $Id: driver.c,v 1.46 2004/06/02 20:30:56 hbirr Exp $ /* $Id: driver.c,v 1.47 2004/06/20 00:44:55 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -83,8 +83,6 @@ POBJECT_TYPE EXPORTED IoDriverObjectType = NULL;
#define TAG_DRIVER TAG('D', 'R', 'V', 'R') #define TAG_DRIVER TAG('D', 'R', 'V', 'R')
#define TAG_DRIVER_EXTENSION TAG('D', 'R', 'V', 'E') #define TAG_DRIVER_EXTENSION TAG('D', 'R', 'V', 'E')
#define DRIVER_REGISTRY_KEY_BASENAME L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"
/* DECLARATIONS ***************************************************************/ /* DECLARATIONS ***************************************************************/
NTSTATUS STDCALL NTSTATUS STDCALL
@ -524,6 +522,7 @@ IopInitializeDriverModule(
UNICODE_STRING RegistryKey; UNICODE_STRING RegistryKey;
PDRIVER_INITIALIZE DriverEntry = ModuleObject->EntryPoint; PDRIVER_INITIALIZE DriverEntry = ModuleObject->EntryPoint;
NTSTATUS Status; NTSTATUS Status;
WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\";
Status = IopCreateDriverObject( Status = IopCreateDriverObject(
DriverObject, DriverObject,
@ -541,10 +540,10 @@ IopInitializeDriverModule(
if (DeviceNode->ServiceName.Buffer) if (DeviceNode->ServiceName.Buffer)
{ {
RegistryKey.Length = DeviceNode->ServiceName.Length + RegistryKey.Length = DeviceNode->ServiceName.Length +
sizeof(DRIVER_REGISTRY_KEY_BASENAME); sizeof(ServicesKeyName);
RegistryKey.MaximumLength = RegistryKey.Length + sizeof(UNICODE_NULL); RegistryKey.MaximumLength = RegistryKey.Length + sizeof(UNICODE_NULL);
RegistryKey.Buffer = ExAllocatePool(PagedPool, RegistryKey.MaximumLength); RegistryKey.Buffer = ExAllocatePool(PagedPool, RegistryKey.MaximumLength);
wcscpy(RegistryKey.Buffer, DRIVER_REGISTRY_KEY_BASENAME); wcscpy(RegistryKey.Buffer, ServicesKeyName);
wcscat(RegistryKey.Buffer, DeviceNode->ServiceName.Buffer); wcscat(RegistryKey.Buffer, DeviceNode->ServiceName.Buffer);
} }
else else
@ -1086,7 +1085,7 @@ IopInitializeBuiltinDriver(
FileExtension = wcsrchr(DeviceNode->ServiceName.Buffer, '.'); FileExtension = wcsrchr(DeviceNode->ServiceName.Buffer, '.');
if (FileExtension != NULL) if (FileExtension != NULL)
{ {
DeviceNode->ServiceName.Length -= wcslen(DeviceNode->ServiceName.Buffer); DeviceNode->ServiceName.Length -= wcslen(FileExtension) * sizeof(WCHAR);
FileExtension[0] = 0; FileExtension[0] = 0;
} }