Changeset 41891 in vbox for trunk/src/VBox

Timestamp:

Jun 22, 2012 4:56:48 PM (13 years ago)

Author:

vboxsync

Message:

NetShaper: Fixed segmentation fault caused by limits not fitting in 32-bit integer (#5582)

File:

• trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp

@@ -65 +65 @@
     char                                       *pszName;
     /** Maximum number of bytes filters are allowed to transfer. */
-    volatile uint32_t                           cbTransferPerSecMax;
+    volatile uint64_t                           cbTransferPerSecMax;
     /** Number of bytes we are allowed to transfer in one burst. */
     volatile uint32_t                           cbBucketSize;
@@ -152 +152 @@
 #endif
 
-static void pdmNsBwGroupSetLimit(PPDMNSBWGROUP pBwGroup, uint32_t cbTransferPerSecMax)
+static void pdmNsBwGroupSetLimit(PPDMNSBWGROUP pBwGroup, uint64_t cbTransferPerSecMax)
 {
     pBwGroup->cbTransferPerSecMax = cbTransferPerSecMax;
@@ -161 +161 @@
 }
 
-static int pdmNsBwGroupCreate(PPDMNETSHAPER pShaper, const char *pcszBwGroup, uint32_t cbTransferPerSecMax)
+static int pdmNsBwGroupCreate(PPDMNETSHAPER pShaper, const char *pcszBwGroup, uint64_t cbTransferPerSecMax)
 {
     LogFlowFunc(("pShaper=%#p pcszBwGroup=%#p{%s} cbTransferPerSecMax=%u\n",
@@ -402 +402 @@
 }
 
-VMMR3DECL(int) PDMR3NsBwGroupSetLimit(PVM pVM, const char *pcszBwGroup, uint32_t cbTransferPerSecMax)
+VMMR3DECL(int) PDMR3NsBwGroupSetLimit(PVM pVM, const char *pcszBwGroup, uint64_t cbTransferPerSecMax)
 {
     PUVM pUVM = pVM->pUVM;
@@ -475 +475 @@
 {
     PUVM pUVM = pVM->pUVM;
+    AssertPtrReturn(pUVM, VERR_INVALID_POINTER);
     PPDMNETSHAPER pShaper = pUVM->pdm.s.pNetShaper;
+    AssertPtrReturn(pShaper, VERR_INVALID_POINTER);
 
     /* Destroy the bandwidth managers. */
@@ -524 +526 @@
                 for (PCFGMNODE pCur = CFGMR3GetFirstChild(pCfgBwGrp); pCur; pCur = CFGMR3GetNextChild(pCur))
                 {
-                    uint32_t cbMax;
+                    uint64_t cbMax;
                     size_t cchName = CFGMR3GetNameLen(pCur) + 1;
                     char *pszBwGrpId = (char *)RTMemAllocZ(cchName);
@@ -538 +540 @@
 
                     if (RT_SUCCESS(rc))
-                        rc = CFGMR3QueryU32(pCur, "Max", &cbMax);
+                        rc = CFGMR3QueryU64(pCur, "Max", &cbMax);
                     if (RT_SUCCESS(rc))
                         rc = pdmNsBwGroupCreate(pNetShaper, pszBwGrpId, cbMax);