37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
|
From a8bc17bf7f94f684ba518c56e56b41974c50305e 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 91c1504544..432c433540 100644
|
||
|
|
--- a/hw/net/virtio-net.c
|
||
|
|
+++ b/hw/net/virtio-net.c
|
||
|
|
@@ -1931,7 +1931,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
|
||
|
|
|