mirror of
git://git.yoctoproject.org/meta-dpdk.git
synced 2026-01-27 10:31:22 +01:00
dpdk: upgrade 23.11.1 -> 23.11.5
Upgrade to latest available minor version for 23.11 LTS. Drop the CVE fix that is already merged. Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
This commit is contained in:
parent
2b03da4eba
commit
fcf6940189
|
|
@ -1,44 +0,0 @@
|
|||
From 4dc4e33ffa108e945fc8a1e2bbc7819791faa61e Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Matz <olivier.matz@6wind.com>
|
||||
Date: Thu, 28 Nov 2024 12:09:56 +0100
|
||||
Subject: [PATCH] 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>
|
||||
|
||||
CVE: CVE-2024-11614
|
||||
|
||||
Upstream-Status: Backport [https://git.dpdk.org/dpdk/commit/?id=4dc4e33ffa108e945fc8a1e2bbc7819791faa61e]
|
||||
|
||||
Signed-off-by: Divya Chellam <divya.chellam@windriver.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 895a79cf51..058b5842f2 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;
|
||||
--
|
||||
2.40.0
|
||||
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
include dpdk.inc
|
||||
|
||||
SRC_URI += " file://0001-config-meson-get-cpu_instruction_set-from-meson-opti.patch \
|
||||
file://CVE-2024-11614.patch \
|
||||
"
|
||||
|
||||
STABLE = "-stable"
|
||||
BRANCH = "23.11"
|
||||
SRCREV = "a6ec5765cf83d3d58cbd6d4ed5b92b4a06f8a808"
|
||||
SRCREV = "62f583c49bf67dd4d6733ece14e55fe6839e66d1"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
def get_cpu_instruction_set(bb, d):
|
||||
Loading…
Reference in New Issue
Block a user