vbox的更動 62201 路徑 trunk/src/VBox/Additions

時間撮記:

2016-7-12 下午02:14:55 (8 年 以前)

作者:

vboxsync

訊息:

bugref:8087: Additions/x11: support non-root X server: improve preventing loading of OpenGL libraries by the X server. We support client-side OpenGL, but not server-side. Now we intercept functions that the X server will call and check for it rather than trying to overwrite the libraries in memory with the Mesa OpenGL ones. Also fix locating the Mesa libraries. Hopefully this can be removed altogether, but not just before the release.

位置:

trunk/src/VBox/Additions

檔案:

• common/crOpenGL/egl.c (修改) (4 筆差異)
• linux/installer/vboxadd.sh (修改) (2 筆差異)

trunk/src/VBox/Additions/common/crOpenGL/egl.c

@@ -29 +29 @@
 #include <GL/glx.h>
 #include <X11/Xlib.h>
+
+#include <stdlib.h>
 
 /*******************************************************************************
@@ -133 +135 @@
     Display *pDisplay;
     int rc, cError, cEvent, cMajor, cMinor;
-
+    /* Prevent working from inside the X server by requiring a valid DISPLAY. */
+    char *pszDisplay = getenv("DISPLAY");
+    
+    if (!pszDisplay || !*pszDisplay)
+        return EGL_NO_DISPLAY;
     rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
     if (RT_FAILURE(rc))
@@ -164 +170 @@
 DECLEXPORT(EGLBoolean) eglInitialize (EGLDisplay hDisplay, EGLint *pcMajor, EGLint *pcMinor)
 {
+    /* Prevent working from inside the X server by requiring a valid DISPLAY. */
+    char *pszDisplay = getenv("DISPLAY");
+    
+    if (!pszDisplay || !*pszDisplay)
+        return EGL_FALSE;
     if (!VALID_PTR(hDisplay))
         return setEGLError(EGL_BAD_DISPLAY);
@@ -730 +741 @@
 DECLEXPORT(EGLBoolean) eglBindAPI(EGLenum enmApi)
 {
+    /* Prevent working from inside the X server by requiring a valid DISPLAY. */
+    char *pszDisplay = getenv("DISPLAY");
+    
+    if (!pszDisplay || !*pszDisplay)
+        return EGL_FALSE;
     return enmApi == EGL_OPENGL_API ? clearEGLError() : setEGLError(EGL_BAD_PARAMETER);
 }

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -227 +227 @@
     # Install the guest OpenGL drivers.  For now we don't support
     # multi-architecture installations
+    rm -f /etc/ld.so.conf.d/00vboxvideo.conf
+    ldconfig
     if /usr/bin/VBoxClient --check3d 2>/dev/null; then
         rm -f /var/lib/VBoxGuestAdditions/lib/system/tmp.so
@@ -247 +249 @@
         ln -sf "${INSTALL_DIR}/lib/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1
         echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf
-    else
-        rm -f /etc/ld.so.conf.d/00vboxvideo.conf
     fi
     ldconfig