36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
|
From fdf13ea6fede07538fbe5e2a46fa6d4b2368fa81 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Olivier Matz <olivier.matz@6wind.com>
|
||
|
|
Date: Thu, 28 Nov 2024 12:09:56 +0100
|
||
|
|
Subject: net/virtio: fix Rx checksum calculation
|
||
|
|
|
||
|
|
If hdr->csum_start is larger than packet length, the len argument passed
|
||
|
|
to rte_raw_cksum_mbuf() overflows and causes a segmentation fault.
|
||
|
|
|
||
|
|
Ignore checksum computation in this case.
|
||
|
|
|
||
|
|
CVE-2024-11614
|
||
|
|
|
||
|
|
Fixes: ca7036b4af3a ("vhost: fix offload flags in Rx path")
|
||
|
|
|
||
|
|
Signed-off-by: Maxime Gouin <maxime.gouin@6wind.com>
|
||
|
|
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
|
||
|
|
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
|
||
|
|
---
|
||
|
|
lib/vhost/virtio_net.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
|
||
|
|
index d764d4bc6a..69901ab3b5 100644
|
||
|
|
--- a/lib/vhost/virtio_net.c
|
||
|
|
+++ b/lib/vhost/virtio_net.c
|
||
|
|
@@ -2823,6 +2823,9 @@ vhost_dequeue_offload(struct virtio_net *dev, struct virtio_net_hdr *hdr,
|
||
|
|
*/
|
||
|
|
uint16_t csum = 0, off;
|
||
|
|
|
||
|
|
+ if (hdr->csum_start >= rte_pktmbuf_pkt_len(m))
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
if (rte_raw_cksum_mbuf(m, hdr->csum_start,
|
||
|
|
rte_pktmbuf_pkt_len(m) - hdr->csum_start, &csum) < 0)
|
||
|
|
return;
|