Changeset 10746 in vbox for trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

Timestamp:

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

Author:

vboxsync

Message:

Added pSession argument to all the intnet request packets.

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (8 diffs)

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)