Changeset 60104 in vbox for trunk/src/VBox

Timestamp:

Mar 18, 2016 7:20:19 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: prevent loading the kernel driver if any of the virtual consoles is in graphics mode to prevent conflicts with user-space drivers.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_drv.c (modified) (3 diffs)

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

@@ -52 +52 @@
 #include <linux/module.h>
 #include <linux/console.h>
+#include <linux/vt_kern.h>
 
 #include <drm/drmP.h>
@@ -244 +245 @@
 static int __init vbox_init(void)
 {
+    unsigned i;
+
 #ifdef CONFIG_VGA_CONSOLE
     if (vgacon_text_force() && vbox_modeset == -1)
@@ -251 +254 @@
     if (vbox_modeset == 0)
         return -EINVAL;
+
+    /* Do not load if any of the virtual consoles is in graphics mode to be
+     * sure that we do not pick a fight with a user-mode driver or VESA. */
+    for (i = 0; i < MAX_NR_CONSOLES - 1; ++i)
+        if (vc_cons[i].d->vc_mode == KD_GRAPHICS)
+            return -EINVAL;
+
     return drm_pci_init(&driver, &vbox_pci_driver);
 }