Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dpdk: fix CVE-2024-11614 #35

Open
wants to merge 2 commits into
base: scarthgap-6.6.36-2.1.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions meta-imx-sdk/recipes-extended/dpdk/dpdk/CVE-2024-11614.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
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 <[email protected]>
Signed-off-by: Olivier Matz <[email protected]>
(cherry picked from commit 2b85965865e543373163577c0bba6c4e1dc3a3ad)
---
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 9f314f83c7..9c9d05d4d9 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -2593,6 +2593,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.34.1
2 changes: 2 additions & 0 deletions meta-imx-sdk/recipes-extended/dpdk/dpdk_22.11.bb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ DEPENDS = "numactl python3-pyelftools-native libpcap"
SRC_URI = "${DPDK_SRC};nobranch=1"
DPDK_SRC ?= "git://github.com/nxp-qoriq/dpdk;protocol=https"

SRC_URI:append = " file://CVE-2024-11614.patch"

STABLE = "-stable"
SRCREV = "9298b898fe38482fbb293d431cdeea4297c17e70"

Expand Down