CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: fix CVE-2025-13499

Browse Source 
Upstream-Status: Backport from e180152d3d

Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
This commit is contained in:
Hitendra Prajapati 2025-12-09 18:00:05 +05:30 committed by Anuj Mittal
parent d9e1f6f274
commit 5775e1a643
No known key found for this signature in database
GPG Key ID: 4340AEFE69F5085C
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meta-networking/recipes-support/wireshark/files/CVE-2025-13499.patch Normal file
View File

@ -0,0 +1,45 @@
From e180152d3dae668249f78c72a55a4ba436b57af7 Mon Sep 17 00:00:00 2001
From: Darius Davis <darius-wireshark@free-range.com.au>
Date: Sat, 25 Oct 2025 15:01:34 +1000
Subject: [PATCH] Kafka: Fix decompress_snappy with no xerial chunks.
Instead of returning true without setting outputs, report a failure to
decompress and return false to the caller.
Fix #20823
(cherry picked from commit 49137f8ce93c9f7ac55b69c8e089ba6a422f633e)
CVE-2025-13499
Upstream-Status: Backport [https://gitlab.com/wireshark/wireshark/-/commit/e180152d3dae668249f78c72a55a4ba436b57af7]
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
---
epan/dissectors/packet-kafka.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c
index 482a670..e537013 100644
--- a/epan/dissectors/packet-kafka.c
+++ b/epan/dissectors/packet-kafka.c
@@ -1788,6 +1788,7 @@ decompress_snappy(tvbuff_t *tvb, packet_info *pinfo, int offset, guint32 length,
count++;
DISSECTOR_ASSERT_HINT(count < MAX_LOOP_ITERATIONS, "MAX_LOOP_ITERATIONS exceeded");
}
+ ret = composite_tvb != NULL;
} else {
@@ -1810,9 +1811,8 @@ decompress_snappy(tvbuff_t *tvb, packet_info *pinfo, int offset, guint32 length,
*decompressed_tvb = tvb_new_child_real_data(tvb, decompressed_buffer, (guint)out_size, (gint)out_size);
*decompressed_offset = 0;
-
+ ret = TRUE;
}
- ret = TRUE;
end:
if (composite_tvb) {
tvb_composite_finalize(composite_tvb);
--
2.50.1

1
meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb
View File

@ -14,6 +14,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz
file://0004-lemon-Remove-line-directives.patch \
file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \
file://CVE-2025-9817.patch \
file://CVE-2025-13499.patch \
"
UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions"