Changeset 84584 in vbox for trunk/src/VBox/Additions

Timestamp:

May 28, 2020 12:09:35 PM (5 years ago)

Author:

vboxsync

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

138314

Message:

bugref:9637. setting suid of the drm client

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• display-drm.cpp (modified) (4 diffs)
• display-svga-x11.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/display-drm.cpp

@@ -46 +46 @@
 #include <iprt/err.h>
 #include <iprt/string.h>
-
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+#include <unistd.h>
 #include <stdio.h>
 
@@ -160 +162 @@
                          unsigned cHeads)
 {
+    uid_t guid = getuid();
+    if (setuid(0) == -1)
+    {
+        perror("setuid failed during drm ioctl.");
+    }
+
     int rc;
     struct DRMVMWUPDATELAYOUT ioctlLayout;
@@ -171 +179 @@
     if (RT_FAILURE(rc) && rc != VERR_INVALID_PARAMETER)
         VBClLogFatalError("Failure updating layout, rc=%Rrc\n", rc);
+    setuid(guid);
 }
 
-int main()
-{
+int main(int argc, char *argv[])
+{
+    uid_t guid = getuid();
+    if (setuid(0) == -1)
+    {
+        perror("setuid failed during init.");
+    }
+
+    int rc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(rc))
+        return RTMsgInitFailure(rc);
+    rc = VbglR3InitUser();
+    if (RT_FAILURE(rc))
+        VBClLogFatalError("VbglR3InitUser failed: %Rrc", rc);
+
     struct DRMCONTEXT drmContext = { NIL_RTFILE };
     static struct VMMDevDisplayDef aMonitors[VMW_MAX_HEADS];
-    int rc;
+
     unsigned cEnabledMonitors;
     /* Do not acknowledge the first event we query for to pick up old events,
@@ -201 +223 @@
         return VERR_INVALID_HANDLE;
     }
+    setuid(guid);
     for (;;)
     {

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -685 +685 @@
 static bool init()
 {
-    if (isXwayland())
+    if (1 || isXwayland())
     {
         VBClLogInfo("The parent session seems to be running on Wayland. Starting DRM client\n");