Changeset 87729 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 12, 2021 2:47:03 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142779

Message:

SUPDrv: Build fix. bugref:9937

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -761 +761 @@
                                                     const char *pszLnxModName, void **phMod)
 {
+#if RTLNX_VER_MIN(2,6,30)
     /* Locate the module structure for the caller so can later reference
        and dereference it to prevent unloading while it is being used.
@@ -777 +778 @@
     AssertPtrReturn(pszLnxModName, VERR_INVALID_POINTER);
     AssertReturn(*pszLnxModName, VERR_INVALID_NAME);
-    struct module *pLnxModule = find_module(pszLnxModName);
-    if (pLnxModule)
-        return supdrvLdrRegisterWrappedModule(&g_DevExt, pWrappedModInfo, pLnxModule, phMod);
-    printk("vboxdrv: find_module(%s) failed in SUPDrvLinuxLdrRegisterWrappedModule!\n", pszLnxModName);
-    return VERR_MODULE_NOT_FOUND;
+    if (mutex_lock_interruptible(&module_mutex) == 0)
+    {
+        struct module *pLnxModule = find_module(pszLnxModName);
+        mutex_unlock(&module_mutex);
+        if (pLnxModule)
+            return supdrvLdrRegisterWrappedModule(&g_DevExt, pWrappedModInfo, pLnxModule, phMod);
+        printk("vboxdrv: find_module(%s) failed in SUPDrvLinuxLdrRegisterWrappedModule!\n", pszLnxModName);
+        return VERR_MODULE_NOT_FOUND;
+    }
+    return VERR_INTERRUPTED;
+#else
+    printk("vboxdrv: wrapper modules are not supported on 2.6.29 and earlier. sorry.\n");
+    return VERR_NOT_SUPPORTED;
+#endif
 }
 EXPORT_SYMBOL(SUPDrvLinuxLdrRegisterWrappedModule);