Changeset 93653 in vbox for trunk/src/VBox

Timestamp:

Feb 8, 2022 11:45:44 AM (3 years ago)

Author:

vboxsync

Message:

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

File:

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

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

@@ -1767 +1767 @@
         {
             AssertLogRelMsgFailed(("ring-0 drivers are not supported in this VBox version!\n"));
+            RT_NOREF(pvInterface, cbInterface, pszSymList);
             rc = VERR_NOT_SUPPORTED;
         }
@@ -1812 +1813 @@
         {
             AssertLogRelMsgFailed(("ring-0 drivers are not supported in this VBox version!\n"));
+            RT_NOREF(pvInterface, cbInterface, pszSymList);
             rc = VERR_NOT_SUPPORTED;
         }
@@ -1958 +1960 @@
 {
     PDMDRV_ASSERT_DRVINS(pDrvIns);
+#ifdef PDM_WITH_RING0_DRIVERS
     PVM pVM = pDrvIns->Internal.s.pVMR3;
+#endif
     LogFlow(("pdmR3DrvHlp_CallR0: caller='%s'/%d: uOperation=%#x u64Arg=%#RX64\n",
              pDrvIns->pReg->szName, pDrvIns->iInstance, uOperation, u64Arg));
@@ -1971 +1975 @@
         if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_R0)
         {
+#ifdef PDM_WITH_RING0_DRIVERS
             char szSymbol[          sizeof("drvR0") + sizeof(pDrvIns->pReg->szName) + sizeof("ReqHandler")];
             strcat(strcat(strcpy(szSymbol, "drvR0"),         pDrvIns->pReg->szName),         "ReqHandler");
@@ -1981 +1986 @@
             else
                 pfnReqHandlerR0 = NIL_RTR0PTR;
+#else
+            RT_NOREF(uOperation, u64Arg);
+            rc = VERR_NOT_SUPPORTED;
+#endif
         }
         else
             rc = VERR_ACCESS_DENIED;
     }
-    if (RT_LIKELY(pfnReqHandlerR0 != NIL_RTR0PTR))
-    {
+    if (RT_LIKELY(pfnReqHandlerR0 != NIL_RTR0PTR && RT_SUCCESS(rc)))
+    {
+#ifdef PDM_WITH_RING0_DRIVERS
         /*
          * Make the ring-0 call.
@@ -1998 +2008 @@
         Req.u64Arg          = u64Arg;
         rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), NIL_VMCPUID, VMMR0_DO_PDM_DRIVER_CALL_REQ_HANDLER, 0, &Req.Hdr);
-    }
-
-    LogFlow(("pdmR3DrvHlp_CallR0: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
-             pDrvIns->iInstance, rc));
+#else
+        rc = VERR_NOT_SUPPORTED;
+#endif
+    }
+
+    LogFlow(("pdmR3DrvHlp_CallR0: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
     return rc;
 }