diff --git a/0076-CVE-2024-11614-net-virtio-fix-Rx-checksum-calculation.patch b/0076-CVE-2024-11614-net-virtio-fix-Rx-checksum-calculation.patch new file mode 100644 index 0000000000000000000000000000000000000000..e3d082c409327d5e40dfd855c3c38dc01cc2a630 --- /dev/null +++ b/0076-CVE-2024-11614-net-virtio-fix-Rx-checksum-calculation.patch @@ -0,0 +1,36 @@ +From b8e7797c11e5121d738b8c468ee08f3411474d1c Mon Sep 17 00:00:00 2001 +From: Olivier Matz +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 +Signed-off-by: Olivier Matz +Reviewed-by: Maxime Coquelin +--- + 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 5ec89719c6..49c2052eba 100644 +--- a/lib/vhost/virtio_net.c ++++ b/lib/vhost/virtio_net.c +@@ -2831,6 +2831,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; +-- +cgit v1.2.3 diff --git a/dpdk.spec b/dpdk.spec index e74048cf4930b495f67e25e35d4c773654a91694..fec742cdf2b64bec6f9afcf63cbdf7e944d5c620 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -11,7 +11,7 @@ Name: dpdk Version: 23.11 -Release: 25 +Release: 26 URL: http://dpdk.org Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz @@ -102,6 +102,7 @@ Patch6072: 0072-common-nfp-use-new-kvargs-process-API.patch Patch6073: 0073-net-hns3-support-flow-rule-priority.patch Patch6074: 0074-net-hns3-fix-error-code-for-repeatedly-create-counter.patch Patch6075: 0075-net-hns3-fix-fully-use-hardware-flow-director-table.patch +Patch6076: 0076-CVE-2024-11614-net-virtio-fix-Rx-checksum-calculation.patch BuildRequires: meson BuildRequires: python3-pyelftools @@ -306,6 +307,9 @@ fi /usr/sbin/depmod %changelog +* Tue Dec 24 2024 jiangheng - 23.11-26 +- net/virtio: fix Rx checksum calculation + * Tue Dec 17 2024 chendexi - 23.11-25 - Change %post script to %posttrans.