Changeset 40552 in vbox for trunk

Timestamp:

Mar 20, 2012 3:00:41 PM (13 years ago)

Author:

vboxsync

Message:

Additions/VBoxGuest: Solaris STREAMS driver: cleanups, fixes and more tests.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-solaris-streams.c (modified) (9 diffs)
• testcase/solaris.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris-streams.c

@@ -575 +575 @@
 } g_asTestWPut[] =
 {
-   /* iDBType  iIOCCmd          cbData       pvDataIn   cbDataIn
-      pvDataOut   cbDataOut rcExp pfnExtra */
-    { M_IOCTL, VUIDGFORMAT,     sizeof(int), NULL,      0,
-      PVGFORMAT, CBGFORMAT, 0,    NULL },
-    { M_IOCTL, VUIDSFORMAT,     sizeof(int), PVGFORMAT, CBGFORMAT,
-      NULL,       0,        0,    NULL },
-    { M_IOCTL, MSIOSRESOLUTION, CBMSIOSRES,  PMSIOSRES, CBMSIOSRES,
-      NULL,       0,        0,    testSetResolution }
+   /* iDBType  iIOCCmd          cbData           pvDataIn   cbDataIn
+      pvDataOut   cbDataOut rcExp   pfnExtra */
+    { M_IOCTL, VUIDGFORMAT,     sizeof(int),     NULL,      0,
+      PVGFORMAT, CBGFORMAT, 0,      NULL },
+    { M_IOCTL, VUIDGFORMAT,     sizeof(int) - 1, NULL,      0,
+      NULL,       0,        EINVAL, NULL },
+    { M_IOCTL, VUIDGFORMAT,     sizeof(int) + 1, NULL,      0,
+      PVGFORMAT, CBGFORMAT, 0,      NULL },
+    { M_IOCTL, VUIDSFORMAT,     sizeof(int),     PVGFORMAT, CBGFORMAT,
+      NULL,       0,        0,      NULL },
+    { M_IOCTL, MSIOSRESOLUTION, CBMSIOSRES,      PMSIOSRES, CBMSIOSRES,
+      NULL,       0,        0,      testSetResolution },
+    { M_IOCTL, VUIDGWHEELINFO,  0,               NULL,      0,
+      NULL,       0,        EINVAL, NULL }
 };
 
@@ -619 +625 @@
         RT_ZERO(IOCBlk);
         RT_ZERO(MBlkCont);
+        RT_ZERO(acData);
         DBlk.db_type = g_asTestWPut[i].iDBType;
         IOCBlk.ioc_cmd = g_asTestWPut[i].iIOCCmd;
         IOCBlk.ioc_count = g_asTestWPut[i].cbData;
-        AssertReturnVoid(g_asTestWPut[i].cbDataIn <= sizeof(acData));
+        AssertReturnVoid(g_asTestWPut[i].cbData <= sizeof(acData));
+        AssertReturnVoid(g_asTestWPut[i].cbDataIn <= g_asTestWPut[i].cbData);
+        AssertReturnVoid(g_asTestWPut[i].cbDataOut <= g_asTestWPut[i].cbData);
         memcpy(acData, g_asTestWPut[i].pvDataIn, g_asTestWPut[i].cbDataIn);
         MBlkCont.b_rptr = acData;
-        MBlkCont.b_wptr = acData + g_asTestWPut[i].cbDataIn;
+        MBlkCont.b_wptr = acData + g_asTestWPut[i].cbData;
         MBlk.b_cont = &MBlkCont;
         MBlk.b_rptr = (unsigned char *)&IOCBlk;
@@ -631 +640 @@
         MBlk.b_datap = &DBlk;
         rc = vbgr0SolWPut(WR(&aQueues[0]), &MBlk);
-        RTTEST_CHECK_MSG(hTest, rc == g_asTestWPut[i].rcExp,
-                         (hTest, "i=%u, rc=%d\n", i, rc));
+        RTTEST_CHECK_MSG(hTest, IOCBlk.ioc_error == g_asTestWPut[i].rcExp,
+                         (hTest, "i=%u, IOCBlk.ioc_error=%d\n", i,
+                          IOCBlk.ioc_error));
         RTTEST_CHECK_MSG(hTest, IOCBlk.ioc_count == g_asTestWPut[i].cbDataOut,
                          (hTest, "i=%u, ioc_count=%u\n", i, IOCBlk.ioc_count));
@@ -638 +648 @@
                                         g_asTestWPut[i].cbDataOut),
                          (hTest, "i=%u\n", i));
+        /* Hack to ensure that miocpullup() gets called when needed. */
+        if (   g_asTestWPut[i].iDBType == M_IOCTL
+            && g_asTestWPut[i].cbData > 0)  /* TRANSPARENT == -1 */
+            RTTEST_CHECK_MSG(hTest, MBlk.b_flag == 1, (hTest, "i=%u\n", i));
         if (g_asTestWPut[i].pfnExtra)
             g_asTestWPut[i].pfnExtra(hTest, WR(&aQueues[0]), &MBlk);
@@ -957 +971 @@
         {
             LogFlowFunc(("VUIDGFORMAT\n"));
-            AssertReturn(cbBuffer >= sizeof(int), EINVAL);
+            if (cbBuffer < sizeof(int))
+                return EINVAL;
             *(int *)pvData = VUID_FIRM_EVENT;
             *pcbData = sizeof(int);
@@ -977 +992 @@
 
             LogFlowFunc(("MSIOGETPARMS\n"));
-            AssertReturn(cbBuffer >= sizeof(Ms_parms), EINVAL);
+            if (cbBuffer < sizeof(Ms_parms))
+                return EINVAL;
             *(Ms_parms *)pvData = parms;
             *pcbData = sizeof(Ms_parms);
@@ -991 +1007 @@
 
             LogFlowFunc(("MSIOSRESOLUTION\n"));
-            AssertReturn(cbBuffer >= sizeof(Ms_screen_resolution), EINVAL);
+            if (cbBuffer < sizeof(Ms_screen_resolution))
+                return EINVAL;
             pState->cMaxScreenX = pResolution->width  - 1;
             pState->cMaxScreenY = pResolution->height - 1;
@@ -1007 +1024 @@
         {
             LogFlowFunc(("MSIOBUTTONS\n"));
-            AssertReturn(cbBuffer >= sizeof(int), EINVAL);
+            if (cbBuffer < sizeof(int))
+                return EINVAL;
             *(int *)pvData = 0;
             *pcbData = sizeof(int);
@@ -1015 +1033 @@
         {
             LogFlowFunc(("VUIDGWHEELCOUNT\n"));
-            AssertReturn(cbBuffer >= sizeof(int), EINVAL);
+            if (cbBuffer < sizeof(int))
+                return EINVAL;
             *(int *)pvData = 0;
             *pcbData = sizeof(int);

trunk/src/VBox/Additions/common/VBoxGuest/testcase/solaris.h

@@ -326 +326 @@
 #define freemsg(...) do {} while(0)
 #define putnext(...) do {} while(0)
-#define miocpullup(...) 0
 #define ddi_get_instance(...) 0
 #define pci_config_setup(...) DDI_SUCCESS
@@ -409 +408 @@
 }
 
+/* This does not work like the real version, but does some sanity testing
+ * and sets a flag. */
+static inline int miocpullup(mblk_t *pMBlk, size_t cbMsg)
+{
+    struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
+
+    if (pIOCBlk->ioc_count == TRANSPARENT)
+        return EINVAL;
+    if (   !pMBlk->b_cont
+        || pMBlk->b_cont->b_wptr < pMBlk->b_cont->b_rptr + cbMsg)
+        return EINVAL;
+    pMBlk->b_flag = 1;  /* Test for this to be sure miocpullup was called. */
+    return 0;
+}
+
 /* API stubs with controllable logic */