Changeset 56356 in vbox for trunk

Timestamp:

Jun 11, 2015 12:36:15 PM (9 years ago)

Author:

vboxsync

Message:

vboxdrvDarwinResolveSymbols: Fail if we cannot get the vmx_* symbols we need for raw-mode.

File:

• trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -114 +114 @@
 RT_C_DECLS_END
 
-static void             vboxdrvDarwinResolveSymbols(void);
+static int              vboxdrvDarwinResolveSymbols(void);
 static bool             vboxdrvDarwinCpuHasSMAP(void);
 
@@ -285 +285 @@
 
                 /*
-                 * Registering ourselves as a character device.
+                 * Resolve some extra kernel symbols.
                  */
-                g_iMajorDeviceNo = cdevsw_add(-1, &g_DevCW);
-                if (g_iMajorDeviceNo >= 0)
+                rc = vboxdrvDarwinResolveSymbols();
+                if (RT_SUCCESS(rc))
                 {
+
+                    /*
+                     * Registering ourselves as a character device.
+                     */
+                    g_iMajorDeviceNo = cdevsw_add(-1, &g_DevCW);
+                    if (g_iMajorDeviceNo >= 0)
+                    {
 #ifdef VBOX_WITH_HARDENING
-                    g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
-                                                        UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME_SYS);
+                        g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
+                                                            UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME_SYS);
 #else
-                    g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
-                                                        UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_SYS);
+                        g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
+                                                            UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_SYS);
 #endif
-                    if (g_hDevFsDeviceSys)
-                    {
-                        g_hDevFsDeviceUsr = devfs_make_node(makedev(g_iMajorDeviceNo, 1), DEVFS_CHAR,
-                                                            UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_USR);
-                        if (g_hDevFsDeviceUsr)
+                        if (g_hDevFsDeviceSys)
                         {
-                            LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n",
-                                    VBOX_SVN_REV, SUPDRV_IOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo));
-
-                            /* Register a sleep/wakeup notification callback */
-                            g_pSleepNotifier = registerPrioritySleepWakeInterest(&VBoxDrvDarwinSleepHandler, &g_DevExt, NULL);
-                            if (g_pSleepNotifier == NULL)
-                                LogRel(("VBoxDrv: register for sleep/wakeup events failed\n"));
-
-                            /* Find kernel symbols that are kind of optional. */
-                            vboxdrvDarwinResolveSymbols();
-                            return KMOD_RETURN_SUCCESS;
+                            g_hDevFsDeviceUsr = devfs_make_node(makedev(g_iMajorDeviceNo, 1), DEVFS_CHAR,
+                                                                UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_USR);
+                            if (g_hDevFsDeviceUsr)
+                            {
+                                LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n",
+                                        VBOX_SVN_REV, SUPDRV_IOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo));
+
+                                /* Register a sleep/wakeup notification callback */
+                                g_pSleepNotifier = registerPrioritySleepWakeInterest(&VBoxDrvDarwinSleepHandler, &g_DevExt, NULL);
+                                if (g_pSleepNotifier == NULL)
+                                    LogRel(("VBoxDrv: register for sleep/wakeup events failed\n"));
+
+                                return KMOD_RETURN_SUCCESS;
+                            }
+
+                            LogRel(("VBoxDrv: devfs_make_node(makedev(%d,1),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_USR));
+                            devfs_remove(g_hDevFsDeviceSys);
+                            g_hDevFsDeviceSys = NULL;
                         }
-
-                        LogRel(("VBoxDrv: devfs_make_node(makedev(%d,1),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_USR));
-                        devfs_remove(g_hDevFsDeviceSys);
-                        g_hDevFsDeviceSys = NULL;
+                        else
+                            LogRel(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_SYS));
+
+                        cdevsw_remove(g_iMajorDeviceNo, &g_DevCW);
+                        g_iMajorDeviceNo = -1;
                     }
                     else
-                        LogRel(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_SYS));
-
-                    cdevsw_remove(g_iMajorDeviceNo, &g_DevCW);
-                    g_iMajorDeviceNo = -1;
+                        LogRel(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
                 }
-                else
-                    LogRel(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
                 RTSpinlockDestroy(g_Spinlock);
                 g_Spinlock = NIL_RTSPINLOCK;
@@ -350 +356 @@
  * Resolves kernel symbols we want (but may do without).
  */
-static void vboxdrvDarwinResolveSymbols(void)
+static int vboxdrvDarwinResolveSymbols(void)
 {
     RTDBGKRNLINFO hKrnlInfo;
@@ -356 +362 @@
     if (RT_SUCCESS(rc))
     {
-        /* The VMX stuff. */
+        /*
+         * The VMX stuff - required (for raw-mode).
+         */
         int rc1 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_resume", (void **)&g_pfnVmxResume);
         int rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_suspend", (void **)&g_pfnVmxSuspend);
@@ -371 +379 @@
             g_pfnVmxSuspend = NULL;
             g_pVmxUseCount  = NULL;
-        }
-
+            rc = VERR_SYMBOL_NOT_FOUND;
+        }
+
+        if (RT_SUCCESS(rc))
+        {
 #ifdef SUPDRV_WITH_MSR_PROBER
-        /* MSR prober stuff. */
-        int rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr_carefully", (void **)&g_pfnRdMsrCarefully);
-        if (RT_FAILURE(rc))
-            g_pfnRdMsrCarefully = NULL;
-        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr64_carefully", (void **)&g_pfnRdMsr64Carefully);
-        if (RT_FAILURE(rc))
-            g_pfnRdMsr64Carefully = NULL;
+            /*
+             * MSR prober stuff - optional!
+             */
+            int rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr_carefully", (void **)&g_pfnRdMsrCarefully);
+            if (RT_FAILURE(rc2))
+                g_pfnRdMsrCarefully = NULL;
+            rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr64_carefully", (void **)&g_pfnRdMsr64Carefully);
+            if (RT_FAILURE(rc2))
+                g_pfnRdMsr64Carefully = NULL;
 # ifdef RT_ARCH_AMD64 /* Missing 64 in name, so if implemented on 32-bit it could have different signature. */
-        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "wrmsr_carefully", (void **)&g_pfnWrMsr64Carefully);
-        if (RT_FAILURE(rc))
+            rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "wrmsr_carefully", (void **)&g_pfnWrMsr64Carefully);
+            if (RT_FAILURE(rc2))
 # endif
-            g_pfnWrMsr64Carefully = NULL;
-
-        LogRel(("VBoxDrv: g_pfnRdMsrCarefully=%p g_pfnRdMsr64Carefully=%p g_pfnWrMsr64Carefully=%p\n",
-                g_pfnRdMsrCarefully, g_pfnRdMsr64Carefully, g_pfnWrMsr64Carefully));
+                g_pfnWrMsr64Carefully = NULL;
+
+            LogRel(("VBoxDrv: g_pfnRdMsrCarefully=%p g_pfnRdMsr64Carefully=%p g_pfnWrMsr64Carefully=%p\n",
+                    g_pfnRdMsrCarefully, g_pfnRdMsr64Carefully, g_pfnWrMsr64Carefully));
 
 #endif /* SUPDRV_WITH_MSR_PROBER */
+        }
 
         RTR0DbgKrnlInfoRelease(hKrnlInfo);
@@ -396 +410 @@
     else
         LogRel(("VBoxDrv: Failed to open kernel symbols, rc=%Rrc\n", rc));
+    return rc;
 }