Skip to contentSkip to conversation

hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue

PATCH In review Thomas Huth 2 participants 2 messages Jul 15, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue

QEMU should never abort just because the guest is doing something odd. Let's simply log the error and ignore the bad transmit queue instead.

---
 hw/net/vmxnet3.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
hw/net/vmxnet3.c +7 -2
index eff299f629..f6bd8c53b1 100644
@@ -23,6 +23,7 @@
 #include "net/checksum.h"
 #include "sysemu/sysemu.h"
 #include "qemu/bswap.h"
+#include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/msi.h"
@@ -1093,8 +1094,12 @@ vmxnet3_io_bar0_write(void *opaque, hwaddr addr,
         int tx_queue_idx =
             VMW_MULTIREG_IDX_BY_ADDR(addr, VMXNET3_REG_TXPROD,
                                      VMXNET3_REG_ALIGN);
-        assert(tx_queue_idx <= s->txq_num);
-        vmxnet3_process_tx_queue(s, tx_queue_idx);
+        if (tx_queue_idx <= s->txq_num) {
+            vmxnet3_process_tx_queue(s, tx_queue_idx);
+        } else {
+            qemu_log_mask(LOG_GUEST_ERROR, "vmxnet3: Illegal TX queue %d/%d\n",
+                          tx_queue_idx, s->txq_num);
+        }
         return;
     }
 
Signature · 1 line
2.27.0