Changeset 94976 in vbox for trunk/src/VBox/Devices

Timestamp:

May 10, 2022 9:43:49 AM (3 years ago)

Author:

vboxsync

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

151388

Message:

Devices/DevVirtioNet_1_0: Clear the whole unicast filter table up front instead of trying to selectively clear out the remainder causing a buffer overflow, bugref:3409

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp

@@ -1153 +1153 @@
         if (uVersion > VIRTIONET_SAVEDSTATE_VERSION_3_1_BETA1_LEGACY)
         {
+            /* Zero-out the the Unicast/Multicast filter table */
+            memset(&pThis->aMacUnicastFilter[0], 0, VIRTIONET_MAC_FILTER_LEN * sizeof(RTMAC));
+
             rc = pHlp->pfnSSMGetU8( pSSM, &pThis->fPromiscuous);
             AssertRCReturn(rc, rc);
@@ -1176 +1179 @@
             rc = pHlp->pfnSSMGetMem(pSSM, pThis->aMacUnicastFilter, cCombinedUnicastMulticastEntries * sizeof(RTMAC));
             AssertRCReturn(rc, rc);
-            /* Zero-out the remainder of the Unicast/Multicast filter table */
-            memset(&pThis->aMacUnicastFilter[pThis->cUnicastFilterMacs], 0, VIRTIONET_MAC_FILTER_LEN * sizeof(RTMAC));
             rc = pHlp->pfnSSMGetMem(pSSM, pThis->aVlanFilter, sizeof(pThis->aVlanFilter));
             AssertRCReturn(rc, rc);