Changeset 96885 in vbox

Timestamp:

Sep 26, 2022 7:09:42 PM (2 years ago)

Author:

vboxsync

Message:

Additions: X11: DRM Client: Monitor guest properties in a bit more efficient way, bugref:10134.

Once monitoring guest property change, there is no reason to re-ask host to re-read
guest property value if host already issued notification about the property.
Flag fWasDeleted will also tell if property was removed. This commit also makes a room
to monitor more than one guest property which related to VBoxDRMClient.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/display-drm.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -826 +826 @@
 /** @name DRM client handling
  * @{ */
+/** Guest property names pattern which is used by Guest Additions DRM services. */
+# define VBGLR3DRMPROPPTR           "/VirtualBox/GuestAdd/DRM*"
 /** Guest property that defines if the DRM IPC server access should be restricted to a specific user group. */
 # define VBGLR3DRMIPCPROPRESTRICT   "/VirtualBox/GuestAdd/DRMIpcRestricted"

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

@@ -1085 +1085 @@
  *
  * @param   hIpcServer  IPC server handle.
- */
-static void vbDrmSetIpcServerAccessPermissions(RTLOCALIPCSERVER hIpcServer)
+ * @param   fRestrict   Whether to restrict access to socket or not.
+ */
+static void vbDrmSetIpcServerAccessPermissions(RTLOCALIPCSERVER hIpcServer, bool fRestrict)
 {
     int rc;
 
-    ASMAtomicWriteBool(&g_fDrmIpcRestricted, VbglR3DrmRestrictedIpcAccessIsNeeded());
-
-    if (g_fDrmIpcRestricted)
+    if (fRestrict)
     {
         struct group *pGrp;
@@ -1119 +1118 @@
             VBClLogError("unable to grant IPC server socket access to all users, rc=%Rrc\n", rc);
     }
+
+    /* Set flag for the thread which serves incomming IPC connections. */
+    ASMAtomicWriteBool(&g_fDrmIpcRestricted, fRestrict);
 }
 
@@ -1138 +1140 @@
         do
         {
-            /* Buffer should be big enough to fit guest property data layout: Name\0Value\0Flags\0. */
+            /* Buffer should be big enough to fit guest property data layout: Name\0Value\0Flags\0fWasDeleted\0. */
             static char achBuf[GUEST_PROP_MAX_NAME_LEN];
+            char *pszName = NULL;
+            char *pszValue = NULL;
+            char *pszFlags = NULL;
+            bool fWasDeleted = false;
             uint64_t u64Timestamp = 0;
 
-            rc = VbglR3GuestPropWait(idClient, VBGLR3DRMIPCPROPRESTRICT, achBuf, sizeof(achBuf), u64Timestamp,
-                                     VBOX_DRMIPC_RX_TIMEOUT_MS, NULL, NULL, &u64Timestamp, NULL, NULL, NULL);
+            rc = VbglR3GuestPropWait(idClient, VBGLR3DRMPROPPTR, achBuf, sizeof(achBuf), u64Timestamp,
+                                     VBOX_DRMIPC_RX_TIMEOUT_MS, &pszName, &pszValue, &u64Timestamp,
+                                     &pszFlags, NULL, &fWasDeleted);
             if (RT_SUCCESS(rc))
-                vbDrmSetIpcServerAccessPermissions(hIpcServer);
-            else if (   rc != VERR_TIMEOUT
+            {
+                uint32_t fFlags = 0;
+
+                VBClLogVerbose(1, "guest property change: name: %s, val: %s, flags: %s, fWasDeleted: %RTbool\n",
+                               pszName, pszValue, pszFlags, fWasDeleted);
+
+                if (RT_SUCCESS(GuestPropValidateFlags(pszFlags, &fFlags)))
+                {
+                    if (RTStrNCmp(pszName, VBGLR3DRMIPCPROPRESTRICT, GUEST_PROP_MAX_NAME_LEN) == 0)
+                    {
+                        /* Enforce restricted socket access until guest property exist and READ-ONLY for the guest. */
+                        vbDrmSetIpcServerAccessPermissions(hIpcServer, !fWasDeleted && fFlags & GUEST_PROP_F_RDONLYGUEST);
+                    }
+
+                } else
+                    VBClLogError("guest property change: name: %s, val: %s, flags: %s, fWasDeleted: %RTbool: bad flags\n",
+                                 pszName, pszValue, pszFlags, fWasDeleted);
+
+            } else if (   rc != VERR_TIMEOUT
                      && rc != VERR_INTERRUPTED)
             {
@@ -1284 +1308 @@
 
     /* Set IPC server socket access permissions according to VM configuration. */
-    vbDrmSetIpcServerAccessPermissions(hIpcServer);
+    vbDrmSetIpcServerAccessPermissions(hIpcServer, VbglR3DrmRestrictedIpcAccessIsNeeded());
 
     /* Attempt to start DRM resize task. */