packages/dpdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CVE-2024-11614

Browse Source 
(cherry picked from commit fb083cb389efd504c49cbd9b1a4529775425db1c)
This commit is contained in:
jiangheng 2024-12-24 09:36:50 +08:00 committed by openeuler-sync-bot
parent 20874e83d3
commit a1f2bd7794
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0076-CVE-2024-11614-net-virtio-fix-Rx-checksum-calculation.patch Normal file
View File

@ -0,0 +1,36 @@
From b8e7797c11e5121d738b8c468ee08f3411474d1c 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 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

6
dpdk.spec
View File

@ -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 <jiangheng14@huawei.com> - 23.11-26
- net/virtio: fix Rx checksum calculation
* Tue Dec 17 2024 chendexi <chendexi@kylinos.cn> - 23.11-25
- Change %post script to %posttrans.