Changeset 93652 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 8, 2022 11:26:14 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PDMDriver,DrvIntNet,DrvNetShaper: Properly disable all ring-0 driver stuff. bugref:10094

File:

• trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp (modified) (11 diffs)

trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

@@ -704 +704 @@
                 size_t cb = RT_UOFFSETOF_DYN(PDMDRVINS, achInstanceData[pDrv->pReg->cbInstance]);
                 cb = RT_ALIGN_Z(cb, 16);
+                PPDMDRVINS pNew;
+#undef PDM_WITH_RING0_DRIVERS
+#ifdef PDM_WITH_RING0_DRIVERS
                 bool const fHyperHeap = !!(pDrv->pReg->fFlags & (PDM_DRVREG_FLAGS_R0 | PDM_DRVREG_FLAGS_RC));
-                PPDMDRVINS pNew;
                 if (fHyperHeap)
                     rc = MMHyperAlloc(pVM, cb, 64, MM_TAG_PDM_DRIVER, (void **)&pNew);
                 else
+#endif
                     rc = MMR3HeapAllocZEx(pVM, MM_TAG_PDM_DRIVER, cb, (void **)&pNew);
                 if (RT_SUCCESS(rc))
@@ -722 +725 @@
                     pNew->Internal.s.pDrv           = pDrv;
                     pNew->Internal.s.pVMR3          = pVM;
+#ifdef PDM_WITH_RING0_DRIVERS
                     pNew->Internal.s.pVMR0          = pDrv->pReg->fFlags & PDM_DRVREG_FLAGS_R0 ? pVM->pVMR0ForCall : NIL_RTR0PTR;
                     pNew->Internal.s.pVMRC          = pDrv->pReg->fFlags & PDM_DRVREG_FLAGS_RC ? pVM->pVMRC : NIL_RTRCPTR;
+#endif
                     //pNew->Internal.s.fDetaching     = false;
                     pNew->Internal.s.fVMSuspended   = true; /** @todo should be 'false', if driver is attached at runtime. */
                     //pNew->Internal.s.fVMReset       = false;
+#ifdef PDM_WITH_RING0_DRIVERS
                     pNew->Internal.s.fHyperHeap     = fHyperHeap;
+#endif
                     //pNew->Internal.s.pfnAsyncNotify = NULL;
                     pNew->Internal.s.pCfgHandle     = pNode;
@@ -740 +747 @@
                     pNew->pHlpR3                    = &g_pdmR3DrvHlp;
                     pNew->pvInstanceDataR3          = &pNew->achInstanceData[0];
+#ifdef PDM_WITH_RING0_DRIVERS
                     if (pDrv->pReg->fFlags & PDM_DRVREG_FLAGS_R0)
                     {
@@ -746 +754 @@
                         AssertReleaseRCReturn(rc, rc);
                     }
-#ifdef VBOX_WITH_RAW_MODE_KEEP
+# ifdef VBOX_WITH_RAW_MODE_KEEP
                     if (   (pDrv->pReg->fFlags & PDM_DRVREG_FLAGS_RC)
                         && VM_IS_RAW_MODE_ENABLED(pVM))
@@ -754 +762 @@
                         AssertReleaseRCReturn(rc, rc);
                     }
+# endif
 #endif
 
@@ -996 +1005 @@
 
         /* Finally, the driver it self. */
-        bool fHyperHeap = pCur->Internal.s.fHyperHeap;
+#ifdef PDM_WITH_RING0_DRIVERS
+        bool const fHyperHeap = pCur->Internal.s.fHyperHeap;
+#endif
         ASMMemFill32(pCur, RT_UOFFSETOF_DYN(PDMDRVINS, achInstanceData[pCur->pReg->cbInstance]), 0xdeadd0d0);
+#ifdef PDM_WITH_RING0_DRIVERS
         if (fHyperHeap)
             MMHyperFree(pVM, pCur);
         else
+#endif
             MMR3HeapFree(pCur);
 
@@ -1339 +1352 @@
         AssertReturn(!(fFlags & TMTIMER_FLAGS_NO_RING0), VERR_INVALID_FLAGS);
         Assert(pDrvIns->Internal.s.pDrv->pReg->fFlags & PDM_DRVREG_FLAGS_R0);
-        /* if (!(pDrvIns->Internal.s.fIntFlags & PDMDRVINSINT_FLAGS_R0_ENABLED)) */ /** @todo PDMDRVINSINT_FLAGS_R0_ENABLED? */
+#ifdef PDM_WITH_RING0_DRIVERS
+        if (!(pDrvIns->Internal.s.fIntFlags & PDMDRVINSINT_FLAGS_R0_ENABLED)) /** @todo PDMDRVINSINT_FLAGS_R0_ENABLED? */
+#endif
             fFlags = (fFlags & ~TMTIMER_FLAGS_RING0) | TMTIMER_FLAGS_NO_RING0;
     }
@@ -1743 +1758 @@
     {
         if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_RC)
+#ifdef PDM_WITH_RING0_DRIVERS
             rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3,
                                              pvInterface, cbInterface,
@@ -1748 +1764 @@
                                              pszSymPrefix, pszSymList,
                                              false /*fRing0OrRC*/);
+#else
+        {
+            AssertLogRelMsgFailed(("ring-0 drivers are not supported in this VBox version!\n"));
+            rc = VERR_NOT_SUPPORTED;
+        }
+#endif
         else
         {
@@ -1781 +1803 @@
     {
         if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_R0)
+#ifdef PDM_WITH_RING0_DRIVERS
             rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3,
                                              pvInterface, cbInterface,
@@ -1786 +1809 @@
                                              pszSymPrefix, pszSymList,
                                              true /*fRing0OrRC*/);
+#else
+        {
+            AssertLogRelMsgFailed(("ring-0 drivers are not supported in this VBox version!\n"));
+            rc = VERR_NOT_SUPPORTED;
+        }
+#endif
         else
         {