francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
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
|
|
|