[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/5] hw/net/vmxnet3: Do not abort if the guest is trying to use an
From: |
Thomas Huth |
Subject: |
[PULL 3/5] hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue |
Date: |
Mon, 19 Jul 2021 12:26:38 +0200 |
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.
Buglink: https://bugs.launchpad.net/qemu/+bug/1926111
Message-Id: <20210715103755.1035566-1-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/net/vmxnet3.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index eff299f629..f6bd8c53b1 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -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;
}
--
2.27.0
- [PULL 0/5] Misc fixes for 6.1, Thomas Huth, 2021/07/19
- [PULL 1/5] ci: build & store windows installer, Thomas Huth, 2021/07/19
- [PULL 2/5] configure: Fix endianess test with LTO, Thomas Huth, 2021/07/19
- [PULL 3/5] hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue,
Thomas Huth <=
- [PULL 5/5] hw/ide: Fix crash when plugging a piix3-ide device into the x-remote machine, Thomas Huth, 2021/07/19
- [PULL 4/5] hw/net/net_tx_pkt: Fix crash detected by fuzzer, Thomas Huth, 2021/07/19
- Re: [PULL 0/5] Misc fixes for 6.1, Peter Maydell, 2021/07/19