Changeset 81070 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB

Timestamp:

Sep 30, 2019 10:03:16 AM (5 years ago)

Author:

vboxsync

Message:

USB/win: Log an error to Event Viewer if INTERNAL_IOCTL_PROXY_STARTUP fails to find the passed-in PDO.

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp

@@ -733 +733 @@
  * @param   cbDumpData     Number of bytes at pDumpData.
  * @param   pDumpData      Pointer to data that will be added to the message (see 'details' tab).
+ *
+ * NB: We only use IoLogMsg.dll as the message file, limiting
+ * ErrCode to status codes and messages defined in ntiologc.h
  */
 static void vboxUsbMonLogError(NTSTATUS ErrCode, NTSTATUS ReturnedStatus, ULONG uErrId, USHORT cbDumpData, PVOID pDumpData)
@@ -1331 +1334 @@
             }
 
-            pOut->u.hDev = VBoxUsbFltProxyStarted(pOut->u.pPDO);
+            PDEVICE_OBJECT pDevObj = pOut->u.pPDO;
+            pOut->u.hDev = VBoxUsbFltProxyStarted(pDevObj);
+
+            /* If we couldn't find the PDO in our list, that's a real problem and
+             * the capturing will not really work. Log an error.
+             */
+            if (!pOut->u.hDev)
+                vboxUsbMonLogError(IO_ERR_DRIVER_ERROR, STATUS_SUCCESS, 2, sizeof("INTERNAL_IOCTL_PROXY_STARTUP"), "INTERNAL_IOCTL_PROXY_STARTUP");
+
             ASSERT_WARN(pOut->u.hDev, ("zero hDev"));
             ASSERT_WARN(Status == STATUS_SUCCESS, ("unexpected status, 0x%x", Status));