Changeset 103788 in vbox

Timestamp:

Mar 11, 2024 5:50:25 PM (12 months ago)

Author:

vboxsync

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

162157

Message:

Linux Additions: Add possiblity to prevent kernel modules from loading in kernel command line, bugref:8409.

Add to kernel command line either vboxguest.disabled=1 and/or vboxsf.disabled=1
and/or vboxvideo.disabled=1 in order to prevent certain module or all of them
from loading during system boot.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest-linux.c (modified) (2 diffs)
• common/VBoxGuest/linux/files_vboxguest (modified) (1 diff)
• linux/drm/files_vboxvideo_drv (modified) (1 diff)
• linux/drm/vbox_drv.c (modified) (2 diffs)
• linux/sharedfolders/files_vboxsf (modified) (1 diff)
• linux/sharedfolders/vfsmod.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -80 +80 @@
 #include <VBox/err.h>
 #include <VBox/log.h>
+#include <VBox/VBoxLnxModInline.h>
 
 
@@ -708 +709 @@
     PRTLOGGER                   pRelLogger;
     int                         rc;
+
+    /* Check if modue loading was disabled. */
+    if (!vbox_mod_should_load())
+        return -EINVAL;
 
     /*

trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

@@ -99 +99 @@
     ${PATH_ROOT}/include/VBox/VBoxGuestMangling.h=>include/VBox/VBoxGuestMangling.h \
     ${PATH_ROOT}/include/VBox/version.h=>include/VBox/version.h \
+    ${PATH_ROOT}/include/VBox/VBoxLnxModInline.h=>VBox/VBoxLnxModInline.h \
     ${PATH_ROOT}/include/VBox/HostServices/GuestPropertySvc.h=>include/VBox/HostServices/GuestPropertySvc.h \
     ${PATH_ROOT}/include/VBox/vmm/cpuidcall.h=>include/VBox/vmm/cpuidcall.h \

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -39 +39 @@
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoErr.h=>vbox_err.h \
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>vboxvideo_vbe.h \
+    ${PATH_ROOT}/include/VBox/VBoxLnxModInline.h=>VBox/VBoxLnxModInline.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>hgsmi_base.c \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>modesetting.c \

trunk/src/VBox/Additions/linux/drm/vbox_drv.c

@@ -64 +64 @@
 #endif /* !CONFIG_VGA_CONSOLE */
 
+#include <VBox/VBoxLnxModInline.h>
+
 static int vbox_modeset = -1;
 
@@ -414 +416 @@
 static int __init vbox_init(void)
 {
+        /* Check if modue loading was disabled. */
+        if (!vbox_mod_should_load())
+                return -EINVAL;
+
         printk("vboxvideo: loading version " VBOX_VERSION_STRING " r" __stringify(VBOX_SVN_REV) "\n");
         if (VBOX_VIDEO_NOMODESET())

trunk/src/VBox/Additions/linux/sharedfolders/files_vboxsf

@@ -74 +74 @@
     ${PATH_ROOT}/include/VBox/VMMDev.h=>include/VBox/VMMDev.h \
     ${PATH_ROOT}/include/VBox/VMMDevCoreTypes.h=>include/VBox/VMMDevCoreTypes.h \
+    ${PATH_ROOT}/include/VBox/VBoxLnxModInline.h=>VBox/VBoxLnxModInline.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInternal.h=>VBoxGuestR0LibInternal.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp=>VBoxGuestR0LibGenericRequest.c \

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -64 +64 @@
 # include <linux/parser.h>
 #endif
+#include <VBox/VBoxLnxModInline.h>
 
 
@@ -1621 +1622 @@
     SFLOGFLOW(("vboxsf: init\n"));
 
+    /* Check if modue loading was disabled. */
+    if (!vbox_mod_should_load())
+        return -EINVAL;
+
     /*
      * Must be paranoid about the vbsf_mount_info_new size.