Changeset 10746 in vbox for trunk

Timestamp:

Jul 18, 2008 12:43:53 PM (16 years ago)

Author:

vboxsync

Message:

Added pSession argument to all the intnet request packets.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (5 diffs)
• src/VBox/Devices/Network/DrvIntNet.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (8 diffs)

trunk/include/VBox/intnet.h

@@ -676 +676 @@
     /** The request header. */
     SUPVMMR0REQHDR  Hdr;
+    /** Alternative to passing the taking the session from the VM handle.
+     * Either use this member or use the VM handle, don't do both. */
+    PSUPDRVSESSION  pSession;
     /** The handle to the network interface. */
     INTNETIFHANDLE  hIf;
@@ -692 +695 @@
 {
     /** The request header. */
-    SUPVMMR0REQHDR          Hdr;
+    SUPVMMR0REQHDR  Hdr;
+    /** Alternative to passing the taking the session from the VM handle.
+     * Either use this member or use the VM handle, don't do both. */
+    PSUPDRVSESSION  pSession;
     /** Handle to the interface. */
-    INTNETIFHANDLE          hIf;
+    INTNETIFHANDLE  hIf;
     /** The pointer to the ring3 buffer. (output) */
     R3PTRTYPE(PINTNETBUF)   pRing3Buf;
@@ -712 +718 @@
     /** The request header. */
     SUPVMMR0REQHDR  Hdr;
+    /** Alternative to passing the taking the session from the VM handle.
+     * Either use this member or use the VM handle, don't do both. */
+    PSUPDRVSESSION  pSession;
     /** Handle to the interface. */
     INTNETIFHANDLE  hIf;
@@ -731 +740 @@
     /** The request header. */
     SUPVMMR0REQHDR  Hdr;
+    /** Alternative to passing the taking the session from the VM handle.
+     * Either use this member or use the VM handle, don't do both. */
+    PSUPDRVSESSION  pSession;
     /** Handle to the interface. */
     INTNETIFHANDLE  hIf;
@@ -748 +760 @@
     /** The request header. */
     SUPVMMR0REQHDR  Hdr;
+    /** Alternative to passing the taking the session from the VM handle.
+     * Either use this member or use the VM handle, don't do both. */
+    PSUPDRVSESSION  pSession;
     /** Handle to the interface. */
     INTNETIFHANDLE  hIf;

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -237 +237 @@
         SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
         SendReq.Hdr.cbReq = sizeof(SendReq);
+        SendReq.pSession = NULL;
         SendReq.hIf = pThis->hIf;
         pThis->pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
@@ -248 +249 @@
         SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
         SendReq.Hdr.cbReq = sizeof(SendReq);
+        SendReq.pSession = NULL;
         SendReq.hIf = pThis->hIf;
         rc = pThis->pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pThis->pDrvIns, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
@@ -274 +276 @@
     Req.Hdr.u32Magic    = SUPVMMR0REQHDR_MAGIC;
     Req.Hdr.cbReq       = sizeof(Req);
+    Req.pSession        = NULL;
     Req.hIf             = pThis->hIf;
     Req.fPromiscuous    = fPromiscuous;
@@ -428 +431 @@
         WaitReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
         WaitReq.Hdr.cbReq    = sizeof(WaitReq);
+        WaitReq.pSession     = NULL;
         WaitReq.hIf          = pThis->hIf;
         WaitReq.cMillies     = 30000; /* 30s - don't wait forever, timeout now and then. */
@@ -615 +619 @@
         CloseReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
         CloseReq.Hdr.cbReq = sizeof(CloseReq);
+        CloseReq.pSession = NULL;
         CloseReq.hIf = pThis->hIf;
         pThis->hIf = INTNET_HANDLE_INVALID;
@@ -815 +820 @@
     GetRing3BufferReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
     GetRing3BufferReq.Hdr.cbReq = sizeof(GetRing3BufferReq);
+    GetRing3BufferReq.pSession = NULL;
     GetRing3BufferReq.hIf = pThis->hIf;
     GetRing3BufferReq.pRing3Buf = NULL;

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -662 +662 @@
 
 /**
+ * Validates a session or VM session argument.
+ *
+ * @returns true / false accordingly.
+ * @param   pVM         The VM argument.
+ * @param   pSession    The session argument.
+ */
+DECLINLINE(bool) vmmR0IsValidSession(PVM pVM, PSUPDRVSESSION pSession)
+{
+    /* Only one out of the two */
+    if (pVM && pSession)
+        return false;
+    if (pVM)
+        pSession = pVM->pSession;
+
+    /** @todo supdrv should validate it. */
+    return VALID_PTR(pSession);
+}
+
+
+/**
  * VMMR0EntryEx worker function, either called directly or when ever possible
  * called thru a longjmp so we can exit safely on failure.
@@ -669 +689 @@
  * @param   enmOperation    Which operation to execute.
  * @param   pReqHdr         This points to a SUPVMMR0REQHDR packet. Optional.
+ *                          The support driver validates this if it's present.
  * @param   u64Arg          Some simple constant argument.
  * @remarks Assume called with interrupts _enabled_.
@@ -862 +883 @@
         {
             PINTNETOPENREQ pReq = (PINTNETOPENREQ)pReqHdr;
-            if (u64Arg || !pReq || (pVM ? pReq->pSession != NULL : !pReq->pSession))
+            if (u64Arg || !pReq || !vmmR0IsValidSession(pVM, pReq->pSession))
                 return VERR_INVALID_PARAMETER;
             if (!g_pIntNet)
@@ -870 +891 @@
 
         case VMMR0_DO_INTNET_IF_CLOSE:
-            if (!pVM || u64Arg)
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFCLOSEREQ)pReqHdr)->pSession))
                 return VERR_INVALID_PARAMETER;
             if (!g_pIntNet)
@@ -877 +898 @@
 
         case VMMR0_DO_INTNET_IF_GET_RING3_BUFFER:
-            if (!pVM || u64Arg)
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFGETRING3BUFFERREQ)pReqHdr)->pSession))
                 return VERR_INVALID_PARAMETER;
             if (!g_pIntNet)
@@ -884 +905 @@
 
         case VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE:
-            if (!pVM || u64Arg)
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFSETPROMISCUOUSMODEREQ)pReqHdr)->pSession))
                 return VERR_INVALID_PARAMETER;
             if (!g_pIntNet)
@@ -891 +912 @@
 
         case VMMR0_DO_INTNET_IF_SEND:
-            if (!pVM || u64Arg)
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFSENDREQ)pReqHdr)->pSession))
                 return VERR_INVALID_PARAMETER;
             if (!g_pIntNet)
@@ -898 +919 @@
 
         case VMMR0_DO_INTNET_IF_WAIT:
-            if (!pVM || u64Arg)
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFWAITREQ)pReqHdr)->pSession))
                 return VERR_INVALID_PARAMETER;
             if (!g_pIntNet)