Changeset 98824 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 2, 2023 5:06:36 PM (2 years ago)

Author:

vboxsync

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

156144

Message:

Guest Control: Made the directory entry reading really dynamic by letting the guest tell us the size it reports to the guest (limited by GSTCTL_DIRENTRY_MAX_SIZE). Re-introduced the #pragma pack(1) because we need the structures on mixed bitness (32 / 64 or vice versa) with the same size. bugref:9783

File:

• trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

@@ -516 +516 @@
         case GUEST_DIR_NOTIFYTYPE_READ:
         {
-            ASSERT_GUEST_MSG_STMT_BREAK(pSvcCbData->mParms == 7, ("mParms=%u\n", pSvcCbData->mParms),
+            ASSERT_GUEST_MSG_STMT_BREAK(pSvcCbData->mParms == 6, ("mParms=%u\n", pSvcCbData->mParms),
                                         vrc = VERR_WRONG_PARAMETER_COUNT);
             ASSERT_GUEST_MSG_STMT_BREAK(pSvcCbData->mpaParms[idx].type == VBOX_HGCM_SVC_PARM_PTR,
@@ -525 +525 @@
             vrc = HGCMSvcGetPv(&pSvcCbData->mpaParms[idx++], (void **)&pEntry, &cbEntry);
             AssertRCBreak(vrc);
-            AssertBreakStmt(   cbEntry >= sizeof(GSTCTLDIRENTRYEX)
+            AssertBreakStmt(   cbEntry >= RT_UOFFSETOF(GSTCTLDIRENTRYEX, szName[2])
                             && cbEntry <= GSTCTL_DIRENTRY_MAX_SIZE, VERR_INVALID_PARAMETER);
             dataCb.u.read.pEntry  = (PGSTCTLDIRENTRYEX)RTMemDup(pEntry, cbEntry);
@@ -775 +775 @@
         HGCMSvcSetU32(&paParms[i++], pEvent->ContextID());
         HGCMSvcSetU32(&paParms[i++], mObjectID /* Guest directory handle */);
-        HGCMSvcSetU32(&paParms[i++], GSTCTL_DIRENTRY_MAX_SIZE);
 
         vrc = sendMessage(HOST_MSG_DIR_READ, i, paParms);