[NTOS:PNP] Fix resource conflict detection

Only resources of HAL were checked against conflicts, not those of PnP Manager Let IoReportResourceForDetection() make a silent conflict check. Otherwise IopCheckResourceDescriptor() will always return 'no conflict'. CORE-17789
reactos · Oct 14, 2021 · 49358f3 · 49358f3 · JoachimHenze · May 11, 2024
1 parent ea8cbbd
commit 49358f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c
@@ -376,7 +376,7 @@ IoReportResourceForDetection(IN PDRIVER_OBJECT DriverObject,
         ResourceList = DriverList;
 
     /* Look for a resource conflict */
-    Status = IopDetectResourceConflict(ResourceList, FALSE, NULL);
+    Status = IopDetectResourceConflict(ResourceList, TRUE, NULL);
     if (Status == STATUS_CONFLICTING_ADDRESSES)
     {
         /* Oh noes */

diff --git a/ntoskrnl/io/pnpmgr/pnpres.c b/ntoskrnl/io/pnpmgr/pnpres.c
@@ -1264,7 +1264,7 @@ IopDetectResourceConflict(
    PKEY_BASIC_INFORMATION KeyInformation;
    PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation;
    PKEY_VALUE_BASIC_INFORMATION KeyNameInformation;
-   ULONG ChildKeyIndex1 = 0, ChildKeyIndex2 = 0, ChildKeyIndex3 = 0;
+   ULONG ChildKeyIndex1 = 0, ChildKeyIndex2, ChildKeyIndex3;
    NTSTATUS Status;
 
    RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP");
@@ -1332,6 +1332,7 @@ IopDetectResourceConflict(
       if (!NT_SUCCESS(Status))
           goto cleanup;
 
+      ChildKeyIndex2 = 0;
       while (TRUE)
       {
           Status = ZwEnumerateKey(ChildKey2,
@@ -1382,6 +1383,7 @@ IopDetectResourceConflict(
           if (!NT_SUCCESS(Status))
               goto cleanup;
 
+          ChildKeyIndex3 = 0;
           while (TRUE)
           {
               Status = ZwEnumerateValueKey(ChildKey3,