Fix infinite loop issue in UsbGetFullHidDescriptor

microsoft · Mar 4, 2025 · 0b74fb4 · 0b74fb4
1 parent 915cfd7
commit 0b74fb4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/HidPkg/UsbHidDxe/UsbHidDxe.c b/HidPkg/UsbHidDxe/UsbHidDxe.c
@@ -697,6 +697,12 @@ UsbGetFullHidDescriptor (
       }
     }
 
+    // Check if the descriptor length is 0
+    if (DescriptorHeader->Len == 0) {
+      DEBUG ((DEBUG_ERROR, "[%a] Descriptor length is 0\n", __FUNCTION__));
+	  break;
+    }
+
     // move to next descriptor
     DescriptorCursor += DescriptorHeader->Len;
     DescriptorHeader  = (USB_DESC_HEAD *)((UINT8 *)DescriptorBuffer + DescriptorCursor);