Changeset 92402 in vbox

Timestamp:

Nov 12, 2021 3:18:39 PM (3 years ago)

Author:

vboxsync

Message:

Additions: Linux: VBoxDRMClient: refactoring, bugref:10134.

No functional change. Only reshape drmSendHints().

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-drm.cpp (modified) (3 diffs)

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

@@ -344 +344 @@
 }
 
-static void drmSendHints(RTFILE hDevice, struct DRMVMWRECT *paRects, unsigned cHeads)
-{
-    int rc;
-    struct DRMVMWUPDATELAYOUT ioctlLayout;
-    uid_t curuid = getuid();
-    if (setreuid(0, 0) != 0)
+/**
+ * This function sends screen layout data to DRM stack.
+ *
+ * @return  VINF_SUCCESS on success, IPRT error code otherwise.
+ * @param   hDevice             Handle to opened DRM device.
+ * @param   paRects             Array of screen configuration data.
+ * @param   cRects              Number of elements in screen configuration array.
+ */
+static int drmSendHints(RTFILE hDevice, struct DRMVMWRECT *paRects, uint32_t cRects)
+{
+    int rc = 0;
+    uid_t curuid;
+
+    /* Store real user id. */
+    curuid = getuid();
+
+    /* Chenge effective user id. */
+    if (setreuid(0, 0) == 0)
+    {
+        struct DRMVMWUPDATELAYOUT ioctlLayout;
+
+        RT_ZERO(ioctlLayout);
+        ioctlLayout.cOutputs = cRects;
+        ioctlLayout.ptrRects = (uint64_t)paRects;
+
+        rc = RTFileIoCtl(hDevice, DRM_IOCTL_VMW_UPDATE_LAYOUT,
+                         &ioctlLayout, sizeof(ioctlLayout), NULL);
+
+        if (setreuid(curuid, 0) != 0)
+        {
+            VBClLogError("VBoxDRMClient: reset of setreuid failed after drm ioctl");
+            rc = VERR_ACCESS_DENIED;
+        }
+    }
+    else
     {
         VBClLogError("VBoxDRMClient: setreuid failed during drm ioctl\n");
-        return;
-    }
-
-    ioctlLayout.cOutputs = cHeads;
-    ioctlLayout.ptrRects = (uint64_t)paRects;
-
-    rc = RTFileIoCtl(hDevice, DRM_IOCTL_VMW_UPDATE_LAYOUT,
-                     &ioctlLayout, sizeof(ioctlLayout), NULL);
-
-    VBClLogInfo("VBoxDRMClient: push layout data to DRM stack %s, %Rrc\n",
-                RT_SUCCESS(rc) ? "successful" : "failed", rc);
-
-    if (setreuid(curuid, 0) != 0)
-    {
-        VBClLogError("VBoxDRMClient: reset of setreuid failed after drm ioctl");
-    }
+        rc = VERR_ACCESS_DENIED;
+    }
+
+    return rc;
 }
 
@@ -405 +422 @@
             if (RT_SUCCESS(rc))
             {
-                VBClLogInfo("VBoxDRMClient: push to DRM stack info about %u display(s)\n", cDisplaysOut);
-                drmSendHints(hDevice, aDisplaysOut, cDisplaysOut);
+                rc = drmSendHints(hDevice, aDisplaysOut, cDisplaysOut);
+                VBClLogInfo("VBoxDRMClient: push screen layout data of %u display(s) to DRM stack has %s (%Rrc)\n",
+                            cDisplaysOut, RT_SUCCESS(rc) ? "succeeded" : "failed", rc);
             }
             else
@@ -436 +454 @@
         VBClLogFatalError("VBoxDRMClient: VbglR3InitUser failed: %Rrc", rc);
 
-
-
     rc = VBClLogCreate("");
     if (RT_FAILURE(rc))