Changeset 60110 in vbox for trunk/src/VBox

Timestamp:

Mar 20, 2016 2:18:44 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 - commit a forgotten fix.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_drv.c (modified) (1 diff)

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

@@ -258 +258 @@
      * 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)
+        if (vc_cons[i].d && vc_cons[i].d->vc_mode == KD_GRAPHICS)
             return -EINVAL;