Changeset 12621 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Sep 21, 2008 4:14:59 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: fixes.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (8 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -663 +663 @@
     if (pState->CurType == kPromiscStream)
     {
-        /*
-         * Careful; Use RTMemAllocZ here to zero-out uninitialized fields.
-         */
-        vboxnetflt_promisc_stream_t *pPromiscStream = RTMemAllocZ(sizeof(vboxnetflt_promisc_stream_t));
+        vboxnetflt_promisc_stream_t *pPromiscStream = RTMemAlloc(sizeof(vboxnetflt_promisc_stream_t));
         if (RT_UNLIKELY(!pPromiscStream))
         {
@@ -678 +675 @@
         pPromiscStream->fRawMode = false;
         pPromiscStream->ModeReqId = 0;
+        pPromiscStream->pHead = NULL;
+        pPromiscStream->pTail = NULL;
+        pPromiscStream->cLoopback = 0;
         pStream = (vboxnetflt_stream_t *)pPromiscStream;
     }
@@ -1787 +1787 @@
             pCur = pNext;
         }
+        pPromiscStream->pHead = NULL;
+        pPromiscStream->pTail = NULL;
         pPromiscStream->cLoopback = 0;
     }
@@ -2420 +2422 @@
 
                 pPromiscStream->pHead = pCur;
-                pPromiscStream->pTail = pPromiscStream->pHead;
+                pPromiscStream->pTail = pCur;
                 pPromiscStream->cLoopback++;
 
@@ -2438 +2440 @@
                 break;
             }
+
+            Assert(pPromiscStream->pTail);
 
             pCur = RTMemAllocZ(sizeof(VBOXNETFLTPACKETID));
@@ -2460 +2464 @@
          * Maximum loopback queue size reached. Re-use head as tail.
          */
-        PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
+        Assert(pPromiscStream->pHead);
+        Assert(pPromiscStream->pTail);
+
+        pCur = pPromiscStream->pHead;
         pPromiscStream->pHead = pPromiscStream->pHead->pNext;
         pPromiscStream->pTail->pNext = pCur;
@@ -2543 +2550 @@
          */
         pCur->cbPacket = 0;
-        pPromiscStream->cLoopback--;
         LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p cLoopback=%d\n", pMsg, pPromiscStream->cLoopback));
         return true;
@@ -2956 +2962 @@
     {
         vboxnetflt_promisc_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
+        if (!pPromiscStream)
+            return VERR_INVALID_POINTER;
+
         queue_t *pPromiscWriteQueue = WR(pPromiscStream->Stream.pReadQueue);