summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/wireshark/files/CVE-2026-3201.patch55
-rw-r--r--meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb1
2 files changed, 56 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/wireshark/files/CVE-2026-3201.patch b/meta-networking/recipes-support/wireshark/files/CVE-2026-3201.patch
new file mode 100644
index 0000000000..178125fed9
--- /dev/null
+++ b/meta-networking/recipes-support/wireshark/files/CVE-2026-3201.patch
@@ -0,0 +1,55 @@
1From 5e80615ebc95c3f57235ab2699b03e45d8071a1c Mon Sep 17 00:00:00 2001
2From: Michael Mann <mmann78@netscape.net>
3Date: Mon, 26 Jan 2026 16:44:58 +0000
4Subject: [PATCH] USB-HID: Bugfix resource exhaustion in
5 parse_report_descriptor()
6
7Sanity range check was removed in 739666a7f5acc270204980e01b4069caf5060f30, restore it
8
9AI-Assisted: no
10Fixes #20972
11
12(cherry picked from commit 6f753c79b7c8ac382e6383dfabd7d5be6e2b722c)
13
14CVE: CVE-2026-3201
15Upstream-Status: Backport [https://gitlab.com/wireshark/wireshark/-/commit/5e80615ebc95c3f57235ab2699b03e45d8071a1c]
16Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
17---
18 epan/dissectors/packet-usb-hid.c | 7 ++++++-
19 1 file changed, 6 insertions(+), 1 deletion(-)
20
21diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
22index 9a402ee..a27606a 100644
23--- a/epan/dissectors/packet-usb-hid.c
24+++ b/epan/dissectors/packet-usb-hid.c
25@@ -3675,6 +3675,7 @@ hid_unpack_signed(guint8 *data, unsigned int idx, unsigned int size, gint32 *val
26 return FALSE;
27 }
28
29+#define MAX_REPORT_DESCRIPTOR_COUNT 100000 // Arbitrary
30 static gboolean
31 parse_report_descriptor(report_descriptor_t *rdesc)
32 {
33@@ -3856,7 +3857,7 @@ parse_report_descriptor(report_descriptor_t *rdesc)
34 }
35
36 /* Usage min and max must be on the same page */
37- if (USAGE_PAGE(usage_min) != USAGE_PAGE(usage_max)) {
38+ if (USAGE_PAGE(usage_min) != USAGE_PAGE(usage_max)) {
39 goto err;
40 }
41
42@@ -3864,6 +3865,10 @@ parse_report_descriptor(report_descriptor_t *rdesc)
43 goto err;
44 }
45
46+ if (wmem_array_get_count(field.usages) + usage_max - usage_min >= MAX_REPORT_DESCRIPTOR_COUNT) {
47+ goto err;
48+ }
49+
50 /* min and max are inclusive */
51 wmem_array_grow(field.usages, usage_max - usage_min + 1);
52 for (guint32 j = usage_min; j <= usage_max; j++) {
53--
542.50.1
55
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb
index 81c300fcb5..dbf7017514 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.14.bb
@@ -17,6 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz
17 file://CVE-2025-13499.patch \ 17 file://CVE-2025-13499.patch \
18 file://CVE-2026-0959.patch \ 18 file://CVE-2026-0959.patch \
19 file://CVE-2026-0962.patch \ 19 file://CVE-2026-0962.patch \
20 file://CVE-2026-3201.patch \
20 " 21 "
21 22
22UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions" 23UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src/all-versions"