ab7fc8ee5b
- target/i386: Introduce SapphireRapids-v3 to add missing features - qtest/fuzz-lsi53c895a-test: set guest RAM to 2G - hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level - target/arm: Fix alignment for VLD4.32 - hw/microblaze: pass random seed to fdt - tests/qtest: npcm7xx-emc-test: Skip checking MAC - tests: mark io-command test as skipped if socat is missing - tests: unit: add NULL-pointer check - tests: test-qga: close socket on failure to connect - vdpa:block device capacity expansion online support vdpa block device update capacity. - virtio-net: Ensure queue index fits with RSS(CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - ppc/vof: Fix unaligned FDT property access - vvfat: Fix reading files with non-continuous clusters - vvfat: Fix bug in writing to middle of file - savevm: Fix load_snapshot error path crash - hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma - hw/remote/message.c: Don't directly invoke DeviceClass:reset - crypto/tlscredspsk: Free username on finalize - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - virtio: remove virtio_tswap16s() call in vring_packed_event_read() - char-stdio: Restore blocking mode of stdout on exit - hw/ppc: spapr: Use qemu_vfree() to free spapr->htab - smbios: sanitize type from external type before checking have_fields_bitmap - spapr_pci: fix leak in spapr_phb_vfio_get_loc_code - KVM: use store-release to mark dirty pages as harvested - monitor/hmp: print trace as option in help for log command - tpm_crb: Avoid backend startup just before shutdown under Xen - crypto/block-luks: make range overlap check more readable - spapr: Free stdout path - target/rx: Use target_ulong for address in LI - virtio-pci: Fix the use of an uninitialized irqfd - rtl8139: Fix behaviour for old kernels. - virtio-rng: block max-bytes=0 MIME-Version: 1.0 - hw/audio/es1370: Clean up comment - vhost-user-server: do not set memory fd non-blocking - ui: reject extended clipboard message if not activated - virtio-net: Fix vhost virtqueue notifiers for RSS - hw/misc/applesmc: Fix memory leak in reset() handler Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 8cd5679908e7af9353c8c4e9198aef2fbb3256ec Mon Sep 17 00:00:00 2001
|
|
From: Akihiko Odaki <akihiko.odaki@daynix.com>
|
|
Date: Mon, 1 Jul 2024 20:58:04 +0900
|
|
Subject: [PATCH] virtio-net: Ensure queue index fits with RSS(CVE-2024-6505)
|
|
|
|
Ensure the queue index points to a valid queue when software RSS
|
|
enabled. The new calculation matches with the behavior of Linux's TAP
|
|
device with the RSS eBPF program.
|
|
|
|
Fixes: 4474e37a5b3a ("virtio-net: implement RX RSS processing")
|
|
Reported-by: Zhibin Hu <huzhibin5@huawei.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
---
|
|
hw/net/virtio-net.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index f7248fc2e2..cef7fc0aa0 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -1818,7 +1818,8 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
|
|
if (!no_rss && n->rss_data.enabled && n->rss_data.enabled_software_rss) {
|
|
int index = virtio_net_process_rss(nc, buf, size);
|
|
if (index >= 0) {
|
|
- NetClientState *nc2 = qemu_get_subqueue(n->nic, index);
|
|
+ NetClientState *nc2 =
|
|
+ qemu_get_subqueue(n->nic, index % n->curr_queue_pairs);
|
|
return virtio_net_receive_rcu(nc2, buf, size, true);
|
|
}
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|