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

Timestamp:

Aug 1, 2023 5:34:48 PM (22 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158650

Message:

include/VBox/usbfilter.h,HostDrivers/VBoxUSB/USBFilter: IUSBDeviceFilter:
USB device interval filters don't work. bugref:10452

Main/Host,Main/USBDeviceFilter: Adding or removing global USB device
filters causes memory corruption wihch can lead to a deadlock or a SEGV
as the list of global USB device filters (llChildren) changes while
the list is being walked.

Frontends/VBoxManage: 'VBoxManage list usbfilters' doesn't display the
'Port' value of the device filter.

Frontends/VBoxManage: 'VBoxManage add usbfilter' and 'VBoxManage modify
usbfilter' both ignore the --product="Value" option.

Main/VirtualBox.xidl: Improve the IUSBDeviceFilter wording to make
things clearer in the 'VirtualBox Programming Guide and Reference Guide'
aka SDKRef.pdf.

HostDrivers/VBoxUSB/testcase/tstUSBFilter: Include a variety of USB
device filter entries which include the 'int:' prefix to fully exercise
the interval filter parsing code.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB

Files:

• USBFilter.cpp (modified) (7 diffs)
• testcase/tstUSBFilter.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp

@@ -226 +226 @@
 
     /*
-     * The string format is: "(<m>|([<m>]-[<n>]))|(<m>|([<m>]-[<n>]))+"
-     * where <m> and <n> are numbers in the decimal, hex (0xNNN) or octal (0NNN)
-     * form. Spaces are allowed around <m> and <n>.
+     * The string format is: "int:((<m>)|([<m>]-[<n>]))(,(<m>)|([<m>]-[<n>]))*"
+     * where <m> and <n> are numbers in decimal, hex (0xNNN) or octal (0NNN).
+     * Spaces are allowed around <m> and <n>.
      */
     unsigned cSubExpressions = 0;
     while (*pszExpr)
     {
+        if (!strncmp(pszExpr, RT_STR_TUPLE("int:")))
+            pszExpr += strlen("int:");
+
         /*
          * Skip remnants of the previous expression and any empty expressions.
          * ('|' is the expression separator.)
          */
-        while (*pszExpr == '|' || RT_C_IS_BLANK(*pszExpr))
+        while (*pszExpr == '|' || RT_C_IS_BLANK(*pszExpr) || *pszExpr == '(' || *pszExpr == ')')
             pszExpr++;
         if (!*pszExpr)
@@ -256 +259 @@
         else
         {
-            /* M or M-N */
+            /* M or M,N or M-N or M- */
             rc = usbfilterReadNumber(&pszExpr, &u16First);
             if (RT_SUCCESS(rc))
             {
+                pszExpr = usbfilterSkipBlanks(pszExpr);
                 if (*pszExpr == '-')
                 {
-                    /* M-N */
+                    pszExpr++;
+                    if (*pszExpr) /* M-N */
+                        rc = usbfilterReadNumber(&pszExpr, &u16Last);
+                    else /* M- */
+                        u16Last = UINT16_MAX;
+                }
+                else if (*pszExpr == ',')
+                {
+                    /* M,N */
                     pszExpr++;
                     rc = usbfilterReadNumber(&pszExpr, &u16Last);
@@ -277 +289 @@
 
         /*
-         * We should either be at the end of the string or at
-         * an expression separator (|).
+         * We should either be at the end of the string, at an expression separator (|),
+         * or at the end of an interval filter (')').
          */
-        if (*pszExpr && *pszExpr != '|' )
+        if (*pszExpr && *pszExpr != '|' && *pszExpr != ')')
             return VERR_INVALID_PARAMETER;
 
@@ -590 +602 @@
 {
     /*
-     * The string format is: "(<m>|([<m>]-[<n>]))|(<m>|([<m>]-[<n>]))+"
-     * where <m> and <n> are numbers in the decimal, hex (0xNNN) or octal (0NNN)
-     * form. Spaces are allowed around <m> and <n>.
+     * The string format is: "int:((<m>)|([<m>]-[<n>]))(,(<m>)|([<m>]-[<n>]))*"
+     * where <m> and <n> are numbers in decimal, hex (0xNNN) or octal (0NNN).
+     * Spaces are allowed around <m> and <n>.
      */
     while (*pszExpr)
     {
+        if (!strncmp(pszExpr, RT_STR_TUPLE("int:")))
+            pszExpr += strlen("int:");
+
         /*
          * Skip remnants of the previous expression and any empty expressions.
          * ('|' is the expression separator.)
          */
-        while (*pszExpr == '|' || RT_C_IS_BLANK(*pszExpr))
+        while (*pszExpr == '|' || RT_C_IS_BLANK(*pszExpr) || *pszExpr == '(' || *pszExpr == ')')
             pszExpr++;
         if (!*pszExpr)
@@ -619 +634 @@
         else
         {
-            /* M or M-N */
+            /* M or M,N or M-N or M- */
             rc = usbfilterReadNumber(&pszExpr, &u16First);
             if (RT_SUCCESS(rc))
@@ -626 +641 @@
                 if (*pszExpr == '-')
                 {
-                    /* M-N */
+                    pszExpr++;
+                    if (*pszExpr) /* M-N */
+                        rc = usbfilterReadNumber(&pszExpr, &u16Last);
+                    else /* M- */
+                        u16Last = UINT16_MAX;
+                }
+                else if (*pszExpr == ',')
+                {
+                    /* M,N */
                     pszExpr++;
                     rc = usbfilterReadNumber(&pszExpr, &u16Last);
@@ -638 +661 @@
         }
 
-        /* On success, we should either be at the end of the string or
-           at an expression separator (|). */
-        if (RT_SUCCESS(rc) && *pszExpr && *pszExpr != '|' )
+        /* On success, we should either be at the end of the string, at an expression
+         * separator (|), or at the end of an interval filter (')').
+         */
+        if (RT_SUCCESS(rc) && *pszExpr && *pszExpr != '|' && *pszExpr != ')')
             rc = VERR_INVALID_PARAMETER;
         if (RT_SUCCESS(rc))

trunk/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp

@@ -286 +286 @@
     TST_CHECK_EXPR(!USBFilterMatch(&Flt1, &Dev));
 
+    /* numeric patterns - interval filters */
+    TST_CHECK_RC(USBFilterSetNumExpression(&Flt1, USBFILTERIDX_VENDOR_ID, "int:0x0-0xffff", true));
+    TST_CHECK_EXPR(USBFilterMatch(&Flt1, &Dev));
+    TST_CHECK_RC(USBFilterSetNumExpression(&Flt1, USBFILTERIDX_VENDOR_ID, "int: 0x0 - 0xffff ", true));
+    TST_CHECK_EXPR(USBFilterMatch(&Flt1, &Dev));
+    TST_CHECK_RC(USBFilterSetNumExpression(&Flt1, USBFILTERIDX_PRODUCT_ID, "int:0x0028-", true));
+    TST_CHECK_EXPR(USBFilterMatch(&Flt1, &Dev));
+    TST_CHECK_RC(USBFilterSetNumExpression(&Flt1, USBFILTERIDX_DEVICE_REV, "int:-0x0045", true));
+    TST_CHECK_EXPR(USBFilterMatch(&Flt1, &Dev));
+    TST_CHECK_RC(USBFilterSetNumExpression(&Flt1, USBFILTERIDX_PORT, "int:1,4", true));
+    TST_CHECK_EXPR(USBFilterMatch(&Flt1, &Dev));
+    TST_CHECK_RC(USBFilterSetNumExpression(&Flt1, USBFILTERIDX_PORT, "int:( 1, 3 )", true));
+    TST_CHECK_EXPR(USBFilterMatch(&Flt1, &Dev));
+
     TST_CHECK_RC(USBFilterSetNumExpression(&Flt1, USBFILTERIDX_VENDOR_ID, "39-59|0x256-0x101f|0xfffff-0xf000|0x1000-0x2000", true));
     TST_CHECK_EXPR(USBFilterMatch(&Flt1, &Dev));