Changeset 101400 in vbox

Timestamp:

Oct 10, 2023 8:39:16 AM (16 months ago)

Author:

vboxsync

Message:

Devices/DevVirtioNet.cpp: Improve checks, bugref:10521

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (4 diffs)

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

@@ -2295 +2295 @@
             Log7Func(("[%s] Guest provided %d unicast MAC Table entries\n", pThis->szInst, cMacs));
 
+            AssertMsgReturn(cMacs <= RT_ELEMENTS(pThis->aMacUnicastFilter),
+                            ("Guest provided Unicast MAC filter table exceeds hardcoded table size"), VIRTIONET_ERROR);
+
             if (cMacs)
             {
                 uint32_t cbMacs = cMacs * sizeof(RTMAC);
-
-                AssertMsgReturn(cbMacs <= sizeof(pThis->aMacUnicastFilter)  / sizeof(RTMAC),
-                                ("Guest provided Unicast MAC filter table exceeds hardcoded table size"), VIRTIONET_ERROR);
 
                 AssertMsgReturn(cbRemaining >= cbMacs,
@@ -2322 +2322 @@
             Log10Func(("[%s] Guest provided %d multicast MAC Table entries\n", pThis->szInst, cMacs));
 
+            AssertMsgReturn(cMacs <= RT_ELEMENTS(pThis->aMacMulticastFilter),
+                            ("Guest provided Unicast MAC filter table exceeds hardcoded table size"), VIRTIONET_ERROR);
+
             if (cMacs)
             {
                 uint32_t cbMacs = cMacs * sizeof(RTMAC);
-
-                AssertMsgReturn(cbMacs <= sizeof(pThis->aMacMulticastFilter)  / sizeof(RTMAC),
-                                ("Guest provided Unicast MAC filter table exceeds hardcoded table size"), VIRTIONET_ERROR);
 
                 AssertMsgReturn(cbRemaining >= cbMacs,
@@ -2375 +2375 @@
             size_t cbRemaining = pVirtqBuf->cbPhysSend;
 
-            AssertMsgReturn(cbRemaining > sizeof(cVirtqPairs),
+            AssertMsgReturn(cbRemaining >= sizeof(cVirtqPairs),
                 ("DESC chain too small for VIRTIONET_CTRL_MQ cmd processing"), VIRTIONET_ERROR);
 
@@ -2381 +2381 @@
             virtioCoreR3VirtqBufDrain(&pThis->Virtio, pVirtqBuf, &cVirtqPairs, sizeof(cVirtqPairs));
 
-            AssertMsgReturn(cVirtqPairs > VIRTIONET_MAX_QPAIRS,
+            AssertMsgReturn(cVirtqPairs <= VIRTIONET_MAX_QPAIRS,
                 ("[%s] Guest CTRL MQ virtq pair count out of range [%d])\n", pThis->szInst, cVirtqPairs), VIRTIONET_ERROR);