Changeset 81322 in vbox

Timestamp:

Oct 17, 2019 3:09:15 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Added limiting of object and list handles (4096 by default).

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-transfers.h (modified) (2 diffs)
• include/VBox/err.h (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (7 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

@@ -975 +975 @@
     /** The transfer's own event source. */
     SHCLEVENTSOURCE          Events;
+    /** Current number of concurrent list handles. */
+    uint32_t                 cListHandles;
+    /** Maximum number of concurrent list handles. */
+    uint32_t                 cMaxListHandles;
     /** Next upcoming list handle. */
     SHCLLISTHANDLE           uListHandleNext;
@@ -983 +987 @@
     /** List of root entries of this transfer. */
     RTLISTANCHOR             lstRoots;
+    /** Current number of concurrent object handles. */
+    uint32_t                 cObjHandles;
+    /** Maximum number of concurrent object handles. */
+    uint32_t                 cMaxObjHandles;
     /** Next upcoming object handle. */
     SHCLOBJHANDLE            uObjHandleNext;

trunk/include/VBox/err.h

@@ -2946 +2946 @@
 /** Maximum number of Shared Clipboard objects has been reached. */
 #define VERR_SHCLPB_MAX_OBJECTS_REACHED             (-7101)
+/** Maximum number of Shared Clipboard lists has been reached. */
+#define VERR_SHCLPB_MAX_LISTS_REACHED               (-7102)
 /** A Shared Clipboard list handle is invalid. */
-#define VERR_SHCLPB_LIST_HANDLE_INVALID             (-7102)
+#define VERR_SHCLPB_LIST_HANDLE_INVALID             (-7103)
 /** A Shared Clipboard objects handle is invalid. */
-#define VERR_SHCLPB_OBJ_HANDLE_INVALID              (-7103)
+#define VERR_SHCLPB_OBJ_HANDLE_INVALID              (-7104)
 /** A Shared Clipboard transfer ID is invalid. */
-#define VERR_SHCLPB_TRANSFER_ID_NOT_FOUND           (-7104)
+#define VERR_SHCLPB_TRANSFER_ID_NOT_FOUND           (-7105)
 /** @} */
 /* SED-END */

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -792 +792 @@
     AssertMsgReturn(pTransfer->pszPathRootAbs, ("Transfer has no root path set\n"), VERR_INVALID_PARAMETER);
     AssertMsgReturn(pOpenCreateParms->pszPath, ("No path in open/create params set\n"), VERR_INVALID_PARAMETER);
+
+    if (pTransfer->cObjHandles == pTransfer->cMaxObjHandles)
+        return VERR_SHCLPB_MAX_OBJECTS_REACHED;
 
     LogFlowFunc(("pszPath=%s, fCreate=0x%x\n", pOpenCreateParms->pszPath, pOpenCreateParms->fCreate));
@@ -834 +837 @@
 
                 RTListAppend(&pTransfer->lstObj, &pInfo->Node);
+                pTransfer->cObjHandles++;
+
+                LogFlowFunc(("cObjHandles=%RU32\n", pTransfer->cObjHandles));
 
                 *phObj = pInfo->hObj;
@@ -914 +920 @@
 
             RTListNodeRemove(&pInfo->Node);
+
+            Assert(pTransfer->cObjHandles);
+            pTransfer->cObjHandles--;
 
             ShClTransferObjHandleInfoDestroy(pInfo);
@@ -1260 +1269 @@
         pTransfer->State.enmStatus = SHCLTRANSFERSTATUS_INITIALIZED; /* Now we're ready to run. */
 
+        pTransfer->cMaxListHandles = _4K; /** @todo Make this dynamic. */
+        pTransfer->cMaxObjHandles  = _4K; /** @todo Ditto. */
+
         if (pTransfer->Callbacks.pfnTransferInitialize)
         {
@@ -1383 +1395 @@
 
     int rc;
+
+    if (pTransfer->cListHandles == pTransfer->cMaxListHandles)
+        return VERR_SHCLPB_MAX_LISTS_REACHED;
 
     if (pTransfer->State.enmSource == SHCLSOURCE_LOCAL)
@@ -1439 +1454 @@
                             {
                                 RTListAppend(&pTransfer->lstList, &pInfo->Node);
-
-                                LogFlowFunc(("pszPathLocalAbs=%s, hList=%RU64\n", pInfo->pszPathLocalAbs, pInfo->hList));
+                                pTransfer->cListHandles++;
+
+                                LogFlowFunc(("pszPathLocalAbs=%s, hList=%RU64, cListHandles=%RU32\n",
+                                             pInfo->pszPathLocalAbs, pInfo->hList, pTransfer->cListHandles));
 
                                 *phList = pInfo->hList;
@@ -1533 +1550 @@
 
             RTListNodeRemove(&pInfo->Node);
+
+            Assert(pTransfer->cListHandles);
+            pTransfer->cListHandles--;
 
             RTMemFree(pInfo);