[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/23] hw/net/vmxnet3: Fix guest-triggerable assert()
From: |
Michael Tokarev |
Subject: |
[PULL 22/23] hw/net/vmxnet3: Fix guest-triggerable assert() |
Date: |
Fri, 8 Sep 2023 12:55:19 +0300 |
From: Thomas Huth <thuth@redhat.com>
The assert() that checks for valid MTU sizes can be triggered by
the guest (e.g. with the reproducer code from the bug ticket
https://gitlab.com/qemu-project/qemu/-/issues/517 ). Let's avoid
this problem by simply logging the error and refusing to activate
the device instead.
Fixes: d05dcd94ae ("net: vmxnet3: validate configuration values during
activate")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
[Mjt: change format specifier from %d to %u for uint32_t argument]
---
hw/net/vmxnet3.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 5dfacb1098..3fb108751a 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -1439,7 +1439,10 @@ static void vmxnet3_activate_device(VMXNET3State *s)
vmxnet3_setup_rx_filtering(s);
/* Cache fields from shared memory */
s->mtu = VMXNET3_READ_DRV_SHARED32(d, s->drv_shmem, devRead.misc.mtu);
- assert(VMXNET3_MIN_MTU <= s->mtu && s->mtu <= VMXNET3_MAX_MTU);
+ if (s->mtu < VMXNET3_MIN_MTU || s->mtu > VMXNET3_MAX_MTU) {
+ qemu_log_mask(LOG_GUEST_ERROR, "vmxnet3: Bad MTU size: %u\n", s->mtu);
+ return;
+ }
VMW_CFPRN("MTU is %u", s->mtu);
s->max_rx_frags =
--
2.39.2
- [PULL 12/23] block: spelling fixes, (continued)
- [PULL 12/23] block: spelling fixes, Michael Tokarev, 2023/09/08
- [PULL 13/23] hw/display/xlnx_dp: update comments, Michael Tokarev, 2023/09/08
- [PULL 14/23] qemu-options.hx: Rephrase the descriptions of the -hd* and -cdrom options, Michael Tokarev, 2023/09/08
- [PULL 15/23] docs tests: Fix use of migrate_set_parameter, Michael Tokarev, 2023/09/08
- [PULL 16/23] tests/qtest/test-hmp: Fix migrate_set_parameter xbzrle-cache-size test, Michael Tokarev, 2023/09/08
- [PULL 17/23] accel/tcg: Fix typo in translator_io_start() description, Michael Tokarev, 2023/09/08
- [PULL 18/23] trivial: Simplify the spots that use TARGET_BIG_ENDIAN as a numeric value, Michael Tokarev, 2023/09/08
- [PULL 19/23] hw/ppc: use g_free() in spapr_tce_table_post_load(), Michael Tokarev, 2023/09/08
- [PULL 21/23] tests/qtest/usb-hcd: Remove the empty "init" tests, Michael Tokarev, 2023/09/08
- [PULL 20/23] target/ppc: use g_free() in test_opcode_table(), Michael Tokarev, 2023/09/08
- [PULL 22/23] hw/net/vmxnet3: Fix guest-triggerable assert(),
Michael Tokarev <=
- [PULL 23/23] qxl: don't assert() if device isn't yet initialized, Michael Tokarev, 2023/09/08