Changeset 102064 in vbox for trunk/src/VBox

Timestamp:

Nov 10, 2023 2:15:11 PM (15 months ago)

Author:

vboxsync

Message:

Additions: X11/Wayland: vboxwl/VBoxClient IPC: Prevent partial reads from IPC socket, bugref:10194.

Do not specify pcbRead parameter to RTLocalIpcSessionRead, so it will attempt to read
entire buffer from IPC socket. This commit also fixes issue when vboxwl was not able to
receive large buffer from VBoxClient.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.cpp

@@ -153 +153 @@
 
     vbcl::ipc::packet_t Packet;
-    size_t cbRead;
 
     AssertPtrReturn(ppvData, VERR_INVALID_PARAMETER);
@@ -161 +160 @@
     {
         /* Read IPC message header. */
-        rc = RTLocalIpcSessionRead(hSession, &Packet, sizeof(Packet), &cbRead);
+        rc = RTLocalIpcSessionRead(hSession, &Packet, sizeof(Packet), NULL);
         if (RT_SUCCESS(rc))
         {
-            if (cbRead == sizeof(Packet))
-            {
-                bool fCheck = true;
+            bool fCheck = true;
 
 #define _CHECK(_cond, _msg, _ptr) \
@@ -176 +173 @@
     }
 
-                _CHECK(Packet.u64Crc > 0,                   "bad crc: 0x%x", Packet.u64Crc);
-                _CHECK(Packet.uSessionId == uSessionId,     "bad session id: %u vs %u", (Packet.uSessionId, uSessionId));
-                _CHECK(Packet.cbData > sizeof(Packet),      "bad cbData: %u", Packet.cbData);
-
-                /* Receive the rest of a message. */
-                if (fCheck)
+            _CHECK(Packet.u64Crc > 0,                   "bad crc: 0x%x", Packet.u64Crc);
+            _CHECK(Packet.uSessionId == uSessionId,     "bad session id: %u vs %u", (Packet.uSessionId, uSessionId));
+            _CHECK(Packet.cbData > sizeof(Packet),      "bad cbData: %u", Packet.cbData);
+
+            /* Receive the rest of a message. */
+            if (fCheck)
+            {
+                uint8_t *puData;
+
+                puData = (uint8_t *)RTMemAllocZ(Packet.cbData);
+                if (RT_VALID_PTR(puData))
                 {
-                    uint8_t *puData;
-
-                    puData = (uint8_t *)RTMemAllocZ(Packet.cbData);
-                    if (RT_VALID_PTR(puData))
+                    /* Add generic header to the beginning of the output buffer
+                     * and receive the rest of the data into it. */
+                    memcpy(puData, &Packet, sizeof(Packet));
+
+                    rc = RTLocalIpcSessionRead(hSession, puData + sizeof(Packet),
+                                               Packet.cbData - sizeof(Packet), NULL);
+                    if (RT_SUCCESS(rc))
                     {
-                        /* Add generic header to the beginning of the output buffer
-                         * and receive the rest of the data into it. */
-                        memcpy(puData, &Packet, sizeof(Packet));
-
-                        rc = RTLocalIpcSessionRead(hSession, puData + sizeof(Packet),
-                                                   Packet.cbData - sizeof(Packet), &cbRead);
-                        if (RT_SUCCESS(rc))
+                        if (vbcl::ipc::packet_verify((vbcl::ipc::packet_t *)puData, Packet.cbData))
                         {
-                            if (cbRead == (Packet.cbData - sizeof(Packet)))
-                            {
-                                if (vbcl::ipc::packet_verify((vbcl::ipc::packet_t *)puData, Packet.cbData))
-                                {
-                                    /* Now return received data to the caller. */
-                                    *ppvData = puData;
-                                }
-                                else
-                                    rc = VERR_NOT_EQUAL;
-                            }
-                            else
-                                rc = VERR_BUFFER_UNDERFLOW;
+                            /* Now return received data to the caller. */
+                            *ppvData = puData;
                         }
-
-                        if (RT_FAILURE(rc))
-                            RTMemFree(puData);
+                        else
+                            rc = VERR_NOT_EQUAL;
                     }
-                    else
-                        rc = VERR_NO_MEMORY;
+
+                    if (RT_FAILURE(rc))
+                        RTMemFree(puData);
                 }
                 else
-                    rc = VERR_INVALID_PARAMETER;
+                    rc = VERR_NO_MEMORY;
             }
+            else
+                rc = VERR_INVALID_PARAMETER;
 
             if (RT_FAILURE(rc))