ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:PNP]

Browse Source 
- Use UNICODE_STRINGs in IopCreateDeviceInstancePath instead of messing around with unsafe string functions and stack buffers

svn path=/trunk/; revision=74052
This commit is contained in:
Thomas Faber
2017-03-04 15:17:30 +00:00
parent bf594249dd
commit ab14ba211c
1 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+42 -30
View File
@@ -1879,9 +1879,8 @@ IopCreateDeviceInstancePath(
_Out_ PUNICODE_STRING InstancePath)
{
IO_STATUS_BLOCK IoStatusBlock;
PWSTR DeviceId;
PWSTR InstanceId;
WCHAR InstancePathBuffer[MAX_PATH];
UNICODE_STRING DeviceId;
UNICODE_STRING InstanceId;
IO_STACK_LOCATION Stack;
NTSTATUS Status;
UNICODE_STRING ParentIdPrefix = { 0, 0, NULL };
@@ -1900,23 +1899,21 @@ IopCreateDeviceInstancePath(
return Status;
}
/* Copy the device id string */
DeviceId = (PWSTR)IoStatusBlock.Information;
wcscpy(InstancePathBuffer, DeviceId);
/* Save the device id string */
RtlInitUnicodeString(&DeviceId, (PWSTR)IoStatusBlock.Information);
/*
* FIXME: Check for valid characters, if there is invalid characters
* then bugcheck.
*/
ExFreePoolWithTag(DeviceId, 0);
DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack (after enumeration)\n");
Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities);
if (!NT_SUCCESS(Status))
{
DPRINT1("IopQueryDeviceCapabilities() failed (Status 0x%08lx)\n", Status);
RtlFreeUnicodeString(&DeviceId);
return Status;
}
@@ -1925,6 +1922,7 @@ IopCreateDeviceInstancePath(
{
/* FIXME: Cleanup device */
DeviceNode->Flags |= DNF_DISABLED;
RtlFreeUnicodeString(&DeviceId);
return STATUS_PLUGPLAY_NO_DEVICE;
}
else
@@ -1940,6 +1938,7 @@ IopCreateDeviceInstancePath(
if (!NT_SUCCESS(Status))
{
DPRINT1("IopGetParentIdPrefix() failed (Status 0x%08lx)\n", Status);
RtlFreeUnicodeString(&DeviceId);
return Status;
}
}
@@ -1953,46 +1952,59 @@ IopCreateDeviceInstancePath(
&Stack);
if (NT_SUCCESS(Status))
{
InstanceId = (PWSTR)IoStatusBlock.Information;
RtlInitUnicodeString(&InstanceId,
(PWSTR)IoStatusBlock.Information);
/* Append the instance id string */
wcscat(InstancePathBuffer, L"\\");
if (ParentIdPrefix.Length > 0)
InstancePath->Length = 0;
InstancePath->MaximumLength = DeviceId.Length + sizeof(WCHAR) +
ParentIdPrefix.Length +
InstanceId.Length +
sizeof(UNICODE_NULL);
if (ParentIdPrefix.Length && InstanceId.Length)
{
/* Add information from parent bus device to InstancePath */
wcscat(InstancePathBuffer, ParentIdPrefix.Buffer);
if (InstanceId && *InstanceId)
{
wcscat(InstancePathBuffer, L"&");
}
InstancePath->MaximumLength += sizeof(WCHAR);
}
if (InstanceId)
InstancePath->Buffer = ExAllocatePoolWithTag(PagedPool,
InstancePath->MaximumLength,
TAG_IO);
if (!InstancePath->Buffer)
{
wcscat(InstancePathBuffer, InstanceId);
RtlFreeUnicodeString(&InstanceId);
RtlFreeUnicodeString(&ParentIdPrefix);
RtlFreeUnicodeString(&DeviceId);
return STATUS_INSUFFICIENT_RESOURCES;
}
/* Start with the device id */
RtlCopyUnicodeString(InstancePath, &DeviceId);
RtlAppendUnicodeToString(InstancePath, L"\\");
/* Add information from parent bus device to InstancePath */
RtlAppendUnicodeStringToString(InstancePath, &ParentIdPrefix);
if (ParentIdPrefix.Length && InstanceId.Length)
{
RtlAppendUnicodeToString(InstancePath, L"&");
}
/* Finally, add the id returned by the driver stack */
RtlAppendUnicodeStringToString(InstancePath, &InstanceId);
/*
* FIXME: Check for valid characters, if there is invalid characters
* then bugcheck
*/
if (InstanceId)
{
ExFreePoolWithTag(InstanceId, 0);
}
RtlFreeUnicodeString(&InstanceId);
RtlFreeUnicodeString(&DeviceId);
}
else
{
DPRINT("IopInitiatePnpIrp(BusQueryInstanceID) failed (Status %x)\n", Status);
*InstancePath = DeviceId;
}
RtlFreeUnicodeString(&ParentIdPrefix);
if (!RtlCreateUnicodeString(InstancePath, InstancePathBuffer))
{
DPRINT1("RtlCreateUnicodeString failed\n");
return STATUS_INSUFFICIENT_RESOURCES;
}
return STATUS_SUCCESS;
}