Changeset 80941 in vbox for trunk

Timestamp:

Sep 23, 2019 9:25:12 AM (5 years ago)

Author:

vboxsync

Message:

USB/win: Don't let the debug build kill the host just because bogus IOCTL input was passed in.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon

Files:

• VBoxUsbFlt.cpp (modified) (2 diffs)
• VBoxUsbMon.cpp (modified) (1 diff)

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

@@ -1222 +1222 @@
 NTSTATUS VBoxUsbFltGetDevice(PVBOXUSBFLTCTX pContext, HVBOXUSBDEVUSR hDevice, PUSBSUP_GETDEV_MON pInfo)
 {
-    Assert(hDevice);
+    if (!hDevice)
+       return STATUS_INVALID_PARAMETER;
 
     memset (pInfo, 0, sizeof (*pInfo));
@@ -1245 +1246 @@
     VBOXUSBFLT_LOCK_RELEASE();
 
-    /* this should not occur */
-    AssertFailed();
-
+    /* We should not get this far with valid input. */
     return STATUS_INVALID_PARAMETER;
 }

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

@@ -1225 +1225 @@
             if (!pvBuffer || cbInBuffer != sizeof (hDevice) || cbOutBuffer < sizeof (*pOut))
             {
-                WARN(("SUPUSBFLT_IOCTL_GET_DEVICE: Invalid input/output sizes. cbIn=%d expected %d. cbOut=%d expected >= %d.",
+                WARN(("SUPUSBFLT_IOCTL_GET_DEVICE: Invalid input/output sizes! cbIn=%d expected %d. cbOut=%d expected >= %d.",
+                        cbInBuffer, sizeof (hDevice), cbOutBuffer, sizeof (*pOut)));
+                Status = STATUS_INVALID_PARAMETER;
+                break;
+            }
+            if (!hDevice)
+            {
+                WARN(("SUPUSBFLT_IOCTL_GET_DEVICE: hDevice is NULL!",
                         cbInBuffer, sizeof (hDevice), cbOutBuffer, sizeof (*pOut)));
                 Status = STATUS_INVALID_PARAMETER;