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

[NTOS:IO] Reduce stack usage in IopLoadServiceModule. CORE-17215

Browse source
This commit is contained in:
Thomas Faber 2020-06-10 08:27:27 +02:00
parent 2858ff53ce
commit 828d5fa93e
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 67 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

116
ntoskrnl/io/iomgr/driver.c
View file

@ -299,6 +299,70 @@ IopNormalizeImagePath(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS
IopQueryServiceSettings(
_In_ PUNICODE_STRING ServiceName,
_Out_ PUNICODE_STRING ServiceImagePath,
_Out_ PULONG ServiceStart)
{
NTSTATUS Status;
RTL_QUERY_REGISTRY_TABLE QueryTable[3];
UNICODE_STRING CCSName = RTL_CONSTANT_STRING(
L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services");
HANDLE CCSKey, ServiceKey;
/* Open CurrentControlSet */
Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ);
if (!NT_SUCCESS(Status))
{
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
&CCSName, Status);
return Status;
}
/* Open service key */
Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ);
if (!NT_SUCCESS(Status))
{
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
ServiceName, Status);
ZwClose(CCSKey);
return Status;
}
/*
* Get information about the service.
*/
RtlZeroMemory(QueryTable, sizeof(QueryTable));
RtlInitUnicodeString(ServiceImagePath, NULL);
QueryTable[0].Name = L"Start";
QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
QueryTable[0].EntryContext = ServiceStart;
QueryTable[1].Name = L"ImagePath";
QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT;
QueryTable[1].EntryContext = ServiceImagePath;
Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE,
(PWSTR)ServiceKey,
QueryTable,
NULL,
NULL);
ZwClose(ServiceKey);
ZwClose(CCSKey);
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlQueryRegistryValues() failed for '%wZ' (Status %lx)\n", ServiceName, Status);
return Status;
}
return Status;
}
/* /*
* IopLoadServiceModule * IopLoadServiceModule
* *
@ -317,11 +381,9 @@ IopLoadServiceModule(
IN PUNICODE_STRING ServiceName, IN PUNICODE_STRING ServiceName,
OUT PLDR_DATA_TABLE_ENTRY *ModuleObject) OUT PLDR_DATA_TABLE_ENTRY *ModuleObject)
{ {
RTL_QUERY_REGISTRY_TABLE QueryTable[3];
ULONG ServiceStart; ULONG ServiceStart;
UNICODE_STRING ServiceImagePath, CCSName; UNICODE_STRING ServiceImagePath;
NTSTATUS Status; NTSTATUS Status;
HANDLE CCSKey, ServiceKey;
PVOID BaseAddress; PVOID BaseAddress;
ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource)); ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource));
@ -341,54 +403,10 @@ IopLoadServiceModule(
} }
else else
{ {
/* Open CurrentControlSet */ Status = IopQueryServiceSettings(ServiceName, &ServiceImagePath, &ServiceStart);
RtlInitUnicodeString(&CCSName,
L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services");
Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", DPRINT("IopQueryServiceSettings() failed for '%wZ' (Status %lx)\n", ServiceName, Status);
&CCSName, Status);
return Status;
}
/* Open service key */
Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ);
if (!NT_SUCCESS(Status))
{
DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
ServiceName, Status);
ZwClose(CCSKey);
return Status;
}
/*
* Get information about the service.
*/
RtlZeroMemory(QueryTable, sizeof(QueryTable));
RtlInitUnicodeString(&ServiceImagePath, NULL);
QueryTable[0].Name = L"Start";
QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
QueryTable[0].EntryContext = &ServiceStart;
QueryTable[1].Name = L"ImagePath";
QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT;
QueryTable[1].EntryContext = &ServiceImagePath;
Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE,
(PWSTR)ServiceKey,
QueryTable,
NULL,
NULL);
ZwClose(ServiceKey);
ZwClose(CCSKey);
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status);
return Status; return Status;
} }
} }